rubyXL 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7eb72c2b30df89f942b111f761a1abbaec3248a
-  data.tar.gz: b9594666aa329bccd62afdeb67fc42a30fd2072a
+  metadata.gz: c62e07b347225544af7f7a79ccf03f0ca48947af
+  data.tar.gz: 048bf6cc5c67f5f8f3c46b2a10e07f8c78938065
 SHA512:
-  metadata.gz: 6de5fe2a07e6f5983196af5834de60b11144cdc1bf3b15917fa3cb9d0f5cc9be2501bea17ac10117f23a0dfdecb6f5478c7c90313ad28ed261d19819ab58d46e
-  data.tar.gz: 3f09a471e147982249df6c658ca34f27bcb49737ecaa1d8e81047251e1536efaa2c14f51ca54069142f3a42f3e1b0326af318351e9802f4b4470def54f9fcf05
+  metadata.gz: 4c07d50da874a34e6ebcba3cdc31810bf5412aaf8220bc46baefbeeb0e2de134b01867eadd4c70697ef8eb161c4b122b76f03042644be55669c98dd5a3bfd6c2
+  data.tar.gz: 1b2717f74996d5b0bdc2a166024f07e64913942bdb5e82fbf1f412e98db4408f7e86aae411836d37e2fc54f899b715664852646a693b7e0807f9cdc8569a54fd

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.4.1

data/lib/rubyXL/objects/simple_types.rb

@@ -109,4 +109,29 @@ module RubyXL
                      actionButtonDocument actionButtonSound actionButtonMovie gear6 gear9 funnel
                      mathPlus mathMinus mathMultiply mathDivide mathEqual mathNotEqual
                      cornerTabs squareTabs plaqueTabs chartX chartStar chartPlus }
+
+  ST_SystemColorVal = %w{ scrollBar background activeCaption inactiveCaption menu window windowFrame menuText
+                          windowText captionText activeBorder inactiveBorder appWorkspace highlight highlightText
+                          btnFace btnShadow grayText btnText inactiveCaptionText btnHighlight 3dDkShadow 3dLight
+                          infoText infoBk hotLight gradientActiveCaption gradientInactiveCaption menuHighlight menuBar }
+
+  ST_SchemeColorVal = %w{ bg1 tx1 bg2 tx2 accent1 accent2 accent3 accent4 accent5 accent6
+                          hlink folHlink phClr dk1 lt1 dk2 lt2 }
+
+  ST_PresetColorVal = %w{ aliceBlue antiqueWhite aqua aquamarine azure beige bisque black blanchedAlmond blue blueViolet
+                          brown burlyWood cadetBlue chartreuse chocolate coral cornflowerBlue cornsilk crimson cyan
+                          dkBlue dkCyan dkGoldenrod dkGray dkGreen dkKhaki dkMagenta dkOliveGreen dkOrange
+                          dkOrchid dkRed dkSalmon dkSeaGreen dkSlateBlue dkSlateGray dkTurquoise dkViolet
+                          deepPink deepSkyBlue dimGray dodgerBlue firebrick floralWhite forestGreen fuchsia
+                          gainsboro ghostWhite gold goldenrod gray green greenYellow honeydew hotPink indianRed
+                          indigo ivory khaki lavender lavenderBlush lawnGreen lemonChiffon ltBlue ltCoral
+                          ltCyan ltGoldenrodYellow ltGray ltGreen ltPink ltSalmon ltSeaGreen ltSkyBlue
+                          ltSlateGray ltSteelBlue ltYellow lime limeGreen linen magenta maroon
+                          medAquamarine medBlue medOrchid medPurple medSeaGreen medSlateBlue medSpringGreen
+                          medTurquoise medVioletRed midnightBlue mintCream mistyRose moccasin navajoWhite
+                          navy oldLace olive oliveDrab orange orangeRed orchid paleGoldenrod paleGreen
+                          paleTurquoise paleVioletRed papayaWhip peachPuff peru pink plum powderBlue purple
+                          red rosyBrown royalBlue saddleBrown salmon sandyBrown seaGreen seaShell sienna
+                          silver skyBlue slateBlue slateGray snow springGreen steelBlue tan teal thistle
+                          tomato turquoise violet wheat white whiteSmoke yellow yellowGreen }
 end

data/lib/rubyXL/objects/theme.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8  <-- magic comment, need this because of sime fancy fonts in the default scheme below. See http://stackoverflow.com/questions/6444826/ruby-utf-8-file-encoding
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/extensions'
 
@@ -27,8 +28,240 @@ module RubyXL
     define_element_name 'a:extLst'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_srgbClr-1.html
+  class RGBColorModelPercentage < OOXMLObject
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:tint')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:shade')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:comp')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:inv')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gray')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alpha')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:sat')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lum')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:red')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:green')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueMod')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gamma')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:invGamma')
+    define_attribute(:r, :int, :required => true)
+    define_attribute(:g, :int, :required => true)
+    define_attribute(:b, :int, :required => true)
+    define_element_name 'a:scrgbClr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_srgbClr-1.html
+  class RGBColorModelHex < OOXMLObject
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:tint')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:shade')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:comp')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:inv')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gray')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alpha')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:sat')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lum')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:red')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:green')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueMod')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gamma')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:invGamma')
+    define_attribute(:val, :string, :required => true)
+    define_element_name 'a:srgbClr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_hslClr-1.html
+  class HSLColor < OOXMLObject
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:tint')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:shade')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:comp')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:inv')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gray')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alpha')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:sat')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lum')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:red')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:green')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueMod')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gamma')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:invGamma')
+    define_attribute(:hue, :int, :required => true)
+    define_attribute(:sat, :int, :required => true)
+    define_attribute(:lum, :int, :required => true)
+    define_element_name 'a:hslClr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_sysClr-1.html
+  class SystemColor < OOXMLObject
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:tint')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:shade')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:comp')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:inv')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gray')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alpha')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:sat')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lum')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:red')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:green')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueMod')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gamma')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:invGamma')
+    define_attribute(:val,     RubyXL::ST_SystemColorVal, :required => true)
+    define_attribute(:lastClr, :string)
+    define_element_name 'a:sysClr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_schemeClr-1.html
+  class SchemeColor < OOXMLObject
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:tint')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:shade')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:comp')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:inv')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gray')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alpha')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:sat')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lum')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:red')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:green')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueMod')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gamma')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:invGamma')
+    define_attribute(:val, RubyXL::ST_SchemeColorVal, :required => true)
+    define_element_name 'a:schemeClr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_prstClr-1.html
+  class PresetColor < OOXMLObject
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:tint')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:shade')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:comp')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:inv')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gray')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alpha')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:alphaMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:hueMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:sat')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:satMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lum')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:lumMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:red')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:redMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:green')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:greenMod')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blue')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueOff')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:blueMod')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:gamma')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:invGamma')
+    define_attribute(:val, RubyXL::ST_PresetColorVal, :required => true)
+    define_element_name 'a:prstClr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_Color.html
+  class CT_Color < OOXMLObject
+    define_child_node(RubyXL::RGBColorModelPercentage)
+    define_child_node(RubyXL::RGBColorModelHex)
+    define_child_node(RubyXL::HSLColor)
+    define_child_node(RubyXL::SystemColor)
+    define_child_node(RubyXL::SchemeColor)
+    define_child_node(RubyXL::PresetColor)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_clrScheme-1.html
   class ColorScheme < OOXMLObject
-#FIXME#
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:dk1')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:lt1')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:dk2')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:lt2')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:accent1')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:accent2')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:accent3')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:accent4')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:accent5')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:accent6')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:hlink')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:folHlink')
+    define_attribute(:name, :string, :required => true)
     define_element_name 'a:clrScheme'
   end
 
@@ -75,20 +308,42 @@ module RubyXL
     define_element_name 'a:xfrm'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_gd-1.html
+  class ShapeGuide < OOXMLObject
+    define_attribute(:name, :string, :required => true)
+    define_attribute(:fmla, :string, :required => true)
+    define_element_name 'a:gd'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_avLst-1.html
+  class AdjustValueList < OOXMLContainerObject
+    define_child_node(RubyXL::ShapeGuide, :collection => true)
+    define_element_name 'a:avLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_rect-1.html
+  class ShapeTextRectangle < OOXMLObject
+    define_attribute(:l, :int, :required => true)
+    define_attribute(:t, :int, :required => true)
+    define_attribute(:r, :int, :required => true)
+    define_attribute(:b, :int, :required => true)
+    define_element_name 'a:rect'
+  end
+
   # http://www.schemacentral.com/sc/ooxml/e-a_custGeom-1.html
   class CustomGeometry < OOXMLObject
-#        a:avLst [0..1]    Adjust Value List
-#        a:gdLst [0..1]    List of Shape Guides
+    define_child_node(RubyXL::AdjustValueList)
+    define_child_node(RubyXL::AdjustValueList, :node_name => 'a:gdLst')
 #        a:ahLst [0..1]    List of Shape Adjust Handles
 #        a:cxnLst [0..1]    List of Shape Connection Sites
-#        a:rect [0..1]    Shape Text Rectangle
+    define_child_node(RubyXL::ShapeTextRectangle)
 #        a:pathLst [1..1]    List of Shape Paths
     define_element_name 'a:custGeom'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_prstGeom-1.html
   class PresetGeometry < OOXMLObject
-#        a:avLst [0..1]    Adjust Value List
+    define_child_node(RubyXL::AdjustValueList)
     define_attribute(:prst, RubyXL::ST_ShapeType, :required => true)
     define_element_name 'a:prstGeom'
   end
@@ -196,6 +451,10 @@ module RubyXL
     def self.parse_file(dirpath)
       full_path = File.join(dirpath, xlsx_path)
       return nil unless File.exist?(full_path)
+
+#      test = super
+#      puts test.inspect
+
       obj = self.new
       
       obj.raw_xml = File.open(full_path, 'r').read

data/lib/rubyXL/parser.rb

@@ -42,6 +42,10 @@ module RubyXL
       wb.content_types = RubyXL::ContentTypes.parse_file(dir_path)
       wb.relationship_container = RubyXL::WorkbookRelationships.parse_file(dir_path)
       wb.root_relationship_container = RubyXL::RootRelationships.parse_file(dir_path)
+      wb.shared_strings_container = RubyXL::SharedStringsTable.parse_file(dir_path)
+
+      # We must always load the stylesheet because it tells us which values are actually dates/times.
+      wb.stylesheet = RubyXL::Stylesheet.parse_file(dir_path)
 
       unless @data_only
         wb.media.load_dir(dir_path)
@@ -62,9 +66,6 @@ module RubyXL
         wb.calculation_chain = RubyXL::CalculationChain.parse_file(dir_path)
       end
 
-      wb.shared_strings_container = RubyXL::SharedStringsTable.parse_file(dir_path)
-      wb.stylesheet = RubyXL::Stylesheet.parse_file(dir_path)
-
       #fills out count information for each font, fill, and border
       wb.cell_xfs.each { |style|
         id = style.font_id

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.4.0</title>
+<title>README - rubyXL 2.4.1</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 2.4.0</title>
+<title>module RubyXL - rubyXL 2.4.1</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">
@@ -258,6 +258,11 @@
         <dd>
         
       
+        <dt id="ST_PresetColorVal">ST_PresetColorVal
+        
+        <dd>
+        
+      
         <dt id="ST_PrintError">ST_PrintError
         
         <dd>
@@ -268,6 +273,11 @@
         <dd>
         
       
+        <dt id="ST_SchemeColorVal">ST_SchemeColorVal
+        
+        <dd>
+        
+      
         <dt id="ST_ShapeType">ST_ShapeType
         
         <dd>
@@ -293,6 +303,11 @@
         <dd>
         
       
+        <dt id="ST_SystemColorVal">ST_SystemColorVal
+        
+        <dd>
+        
+      
         <dt id="ST_TargetScreenSize">ST_TargetScreenSize
         
         <dd>

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 2.4.0</title>
+<title>class RubyXL::AExtension - rubyXL 2.4.1</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 2.4.0</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 2.4.1</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AdjustValueList.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+<meta charset="UTF-8">
+
+<title>class RubyXL::AdjustValueList - rubyXL 2.4.1</title>
+
+<link href="../fonts.css" rel="stylesheet">
+<link href="../rdoc.css" rel="stylesheet">
+
+<script type="text/javascript">
+  var rdoc_rel_prefix = "../";
+</script>
+
+<script src="../js/jquery.js"></script>
+<script src="../js/navigation.js"></script>
+<script src="../js/search_index.js"></script>
+<script src="../js/search.js"></script>
+<script src="../js/searcher.js"></script>
+<script src="../js/darkfish.js"></script>
+
+
+<body id="top" role="document" class="class">
+<nav role="navigation">
+  <div id="project-navigation">
+    <div id="home-section" role="region" title="Quick navigation" class="nav-section">
+  <h2>
+    <a href="../index.html" rel="home">Home</a>
+  </h2>
+
+  <div id="table-of-contents-navigation">
+    <a href="../table_of_contents.html#pages">Pages</a>
+    <a href="../table_of_contents.html#classes">Classes</a>
+    <a href="../table_of_contents.html#methods">Methods</a>
+  </div>
+</div>
+
+    <div id="search-section" role="search" class="project-section initially-hidden">
+  <form action="#" method="get" accept-charset="utf-8">
+    <div id="search-field-wrapper">
+      <input id="search-field" role="combobox" aria-label="Search"
+             aria-autocomplete="list" aria-controls="search-results"
+             type="text" name="search" placeholder="Search" spellcheck="false"
+             title="Type to search, Up and Down to navigate, Enter to load">
+    </div>
+
+    <ul id="search-results" aria-label="Search Results"
+        aria-busy="false" aria-expanded="false"
+        aria-atomic="false" class="initially-hidden"></ul>
+  </form>
+</div>
+
+  </div>
+
+  
+
+  <div id="class-metadata">
+    
+    <div id="parent-class-section" class="nav-section">
+  <h3>Parent</h3>
+
+  
+  <p class="link"><a href="OOXMLContainerObject.html">RubyXL::OOXMLContainerObject</a>
+  
+</div>
+
+    
+    
+    
+  </div>
+</nav>
+
+<main role="main" aria-labelledby="class-RubyXL::AdjustValueList">
+  <h1 id="class-RubyXL::AdjustValueList" class="class">
+    class RubyXL::AdjustValueList
+  </h1>
+
+  <section class="description">
+    
+  </section>
+
+  
+  
+  
+  <section id="5Buntitled-5D" class="documentation-section">
+    
+
+    
+
+    
+
+    
+
+    
+  </section>
+</main>
+
+
+<footer id="validator-badges" role="contentinfo">
+  <p><a href="http://validator.w3.org/check/referer">Validate</a>
+  <p>Generated by <a href="http://rdoc.rubyforge.org">RDoc</a> 4.1.1.
+  <p>Based on <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
+</footer>
+