rubyXL 2.4.4 → 2.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9efea615400ecc23313fb88101f5489a7e3e05d7
+  data.tar.gz: 74524b51f217792e71745b17e1e0c035fe176b09
+SHA512:
+  metadata.gz: c6aabee7765a54890c1cdea5ced6a19a6a7ff942d12527cf6479856a62e8a5eeb5244a7624fac1cd57c686733d55d96c58e6e30e2e15733a65071c65dbf77600
+  data.tar.gz: 871a8d15aa8f1bb0d7309956fee7073978cfa5d61055cf14e8df661fb0439072b6f418ba751a022647d232c53196843639b79dbe3016f5721d1d89248b7b9d1d

data/Gemfile.lock

@@ -7,10 +7,11 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.3.5)
+    addressable (2.3.6)
     atomic (1.1.16)
     builder (3.2.2)
-    descendants_tracker (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.3)
     faraday (0.9.0)
@@ -39,9 +40,9 @@ GEM
     json (1.8.1)
     jwt (0.1.11)
       multi_json (>= 1.5)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.1)
@@ -53,7 +54,7 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.1)
+    rake (10.2.2)
     rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.14.1)
@@ -76,7 +77,7 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    thread_safe (0.2.0)
+    thread_safe (0.3.1)
       atomic (>= 1.1.7, < 2)
     tzinfo (0.3.39)
 

data/VERSION

@@ -1 +1 @@
-2.4.4
+2.5.0

data/lib/rubyXL/objects/simple_types.rb

@@ -135,5 +135,95 @@ module RubyXL
                           silver skyBlue slateBlue slateGray snow springGreen steelBlue tan teal thistle
                           tomato turquoise violet wheat white whiteSmoke yellow yellowGreen }
 
-  ST_PathFillMode = %w{ none norm lighten lightenLess darken darkenLess }
+  ST_PathFillMode         = %w{ none norm lighten lightenLess darken darkenLess }
+  ST_TextVertOverflowType = %w{ overflow ellipsis clip }
+  ST_TextHorzOverflowType = %w{ overflow clip }
+  ST_TextVerticalType     = %w{ horz vert vert270 wordArtVert eaVert mongolianVert wordArtVertRtl }
+  ST_TextWrappingType     = %w{ none square }
+  ST_TextAnchoringType	  = %w{ t ctr b just dist }
+  ST_TextShapeType        = %w{ textNoShape textPlain textStop textTriangle textTriangleInverted textChevron
+                                textChevronInverted textRingInside textRingOutside textArchUp textArchDown
+                                textCircle textButton textArchUpPour textArchDownPour textCirclePour textButtonPour
+                                textCurveUp textCurveDown textCanUp textCanDown textWave1 textWave2 textDoubleWave1
+                                textWave4 textInflate textDeflate textInflateBottom textDeflateBottom textInflateTop
+                                textDeflateTop textDeflateInflate textDeflateInflateDeflate textFadeRight
+                                textFadeLeft textFadeUp textFadeDown textSlantUp textSlantDown
+                                textCascadeUp textCascadeDown }
+
+  ST_PresetMaterialType   = %w{ legacyMatte legacyPlastic legacyMetal legacyWireframe matte plastic metal
+                                warmMatte translucentPowder powder dkEdge softEdge clear flat softmetal }
+
+  ST_BevelPresetType      = %w{ relaxedInset circle slope cross angle softRound convex
+                                coolSlant divot riblet hardEdge artDeco }
+
+
+  ST_LineEndType          = %w{ none triangle stealth diamond oval arrow }
+  ST_LineEndWidth         = %w{ sm med lg }
+  ST_LineEndLength        = %w{ sm med lg }
+
+  ST_PresetLineDashVal    = %w{ solid dot dash lgDash dashDot lgDashDot lgDashDotDot
+                                sysDash sysDot sysDashDot sysDashDotDot }
+
+  ST_TileFlipMode         = %w{ none x y xy }
+  ST_PathShadeType        = %w{ shape circle rect }
+
+  ST_PresetPatternVal     = %w{ pct5 pct10 pct20 pct25 pct30 pct40 pct50 pct60 pct70 pct75 pct80 pct90
+                                horz vert ltHorz ltVert dkHorz dkVert narHorz narVert dashHorz dashVert
+                                cross dnDiag upDiag ltDnDiag ltUpDiag dkDnDiag dkUpDiag
+                                wdDnDiag wdUpDiag dashDnDiag dashUpDiag diagCross smCheck lgCheck
+                                smGrid lgGrid dotGrid smConfetti lgConfetti horzBrick diagBrick
+                                solidDmnd openDmnd dotDmnd plaid sphere weave divot shingle wave trellis zigZag }
+  ST_RectAlignment        = %w{ tl t tr l ctr r bl b br }
+  ST_BlipCompression      = %w{ email screen print hqprint none }
+  ST_ColorSchemeIndex     = %w{ dk1 lt1 dk2 lt2 accent1 accent2 accent3 accent4 accent5 accent6 hlink folHlink }
+  ST_FontCollectionIndex  = %w{ major minor none }
+  ST_BlendMode            = %w{ over mult screen darken lighten }
+  ST_PresetCameraType     = %w{ legacyObliqueTopLeft legacyObliqueTop legacyObliqueTopRight legacyObliqueLeft
+                                legacyObliqueFront legacyObliqueRight legacyObliqueBottomLeft legacyObliqueBottom
+                                legacyObliqueBottomRight legacyPerspectiveTopLeft legacyPerspectiveTop
+                                legacyPerspectiveTopRight legacyPerspectiveLeft legacyPerspectiveFront
+                                legacyPerspectiveRight legacyPerspectiveBottomLeft legacyPerspectiveBottom
+                                legacyPerspectiveBottomRight orthographicFront isometricTopUp isometricTopDown
+                                isometricBottomUp isometricBottomDown isometricLeftUp isometricLeftDown
+                                isometricRightUp isometricRightDown isometricOffAxis1Left isometricOffAxis1Right
+                                isometricOffAxis1Top isometricOffAxis2Left isometricOffAxis2Right isometricOffAxis2Top
+                                isometricOffAxis3Left isometricOffAxis3Right isometricOffAxis3Bottom
+                                isometricOffAxis4Left isometricOffAxis4Right isometricOffAxis4Bottom
+                                obliqueTopLeft obliqueTop obliqueTopRight obliqueLeft obliqueRight obliqueBottomLeft
+                                obliqueBottom obliqueBottomRight perspectiveFront perspectiveLeft perspectiveRight 
+                                perspectiveAbove perspectiveBelow perspectiveAboveLeftFacing perspectiveAboveRightFacing
+                                perspectiveContrastingLeftFacing perspectiveContrastingRightFacing
+                                perspectiveHeroicLeftFacing perspectiveHeroicRightFacing
+                                perspectiveHeroicExtremeLeftFacing perspectiveHeroicExtremeRightFacing 
+                                perspectiveRelaxed perspectiveRelaxedModerately }
+  ST_LightRigType         = %w{ legacyFlat1 legacyFlat2 legacyFlat3 legacyFlat4 legacyNormal1 legacyNormal2
+                                legacyNormal3 legacyNormal4 legacyHarsh1 legacyHarsh2 legacyHarsh3 legacyHarsh4
+                                threePt balanced soft harsh flood contrasting morning sunrise sunset chilly
+                                freezing flat twoPt glow brightRoom }
+  ST_LightRigDirection    = %w{ tl t tr l ctr r bl b br }
+  ST_EffectContainerType  = %w{ sib tree }
+  ST_PresetShadowVal      = %w{ shdw1 shdw2 shdw3 shdw4 shdw5 shdw6 shdw7 shdw8 shdw9 shdw10
+                                shdw11 shdw12 shdw13 shdw14 shdw15 shdw16 shdw17 shdw18 shdw19 shdw20 }
+  ST_TextTabAlignType     = %w{ l ctr r dec }
+  ST_TextAutonumberScheme = %w{ alphaLcParenBoth alphaUcParenBoth alphaLcParenR alphaUcParenR
+                                alphaLcPeriod alphaUcPeriod arabicParenBoth arabicParenR arabicPeriod arabicPlain
+                                romanLcParenBoth romanUcParenBoth romanLcParenR romanUcParenR
+                                romanLcPeriod romanUcPeriod circleNumDbPlain circleNumWdBlackPlain
+                                circleNumWdWhitePlain arabicDbPeriod arabicDbPlain ea1ChsPeriod ea1ChsPlain
+                                ea1ChtPeriod ea1ChtPlain ea1JpnChsDbPeriod ea1JpnKorPlain ea1JpnKorPeriod
+                                arabic1Minus arabic2Minus hebrew2Minus thaiAlphaPeriod thaiAlphaParenR
+                                thaiAlphaParenBoth thaiNumPeriod thaiNumParenR thaiNumParenBoth hindiAlphaPeriod
+                                hindiNumPeriod hindiNumParenR hindiAlpha1Period }
+
+  ST_TextAlignType        = %w{ l ctr r just justLow dist thaiDist }
+  ST_TextFontAlignType    = %w{ auto t ctr base b }
+  ST_LineCap              = %w{ rnd sq flat }
+  ST_CompoundLine         = %w{ sng dbl thickThin thinThick tri }
+  ST_PenAlignment         = %w{ ctr in }
+
+  ST_TextUnderlineType    = %w{ none words sng dbl heavy dotted dottedHeavy dash dashHeavy dashLong dashLongHeavy
+                                dotDash dotDashHeavy dotDotDash dotDotDashHeavy wavy wavyHeavy wavyDbl }
+  ST_TextStrikeType       = %w{ noStrike sngStrike dblStrike }
+  ST_TextCapsType         = %w{ none small all }
+
 end

data/lib/rubyXL/objects/theme.rb

@@ -28,7 +28,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_srgbClr-1.html
-  class RGBColorModelPercentage < OOXMLObject
+  class CT_ScRgbColor < 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')
@@ -64,7 +64,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_srgbClr-1.html
-  class RGBColorModelHex < OOXMLObject
+  class CT_SRgbColor < 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')
@@ -98,7 +98,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_hslClr-1.html
-  class HSLColor < OOXMLObject
+  class CT_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')
@@ -134,7 +134,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_sysClr-1.html
-  class SystemColor < OOXMLObject
+  class CT_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')
@@ -169,7 +169,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_schemeClr-1.html
-  class SchemeColor < OOXMLObject
+  class CT_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')
@@ -203,7 +203,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_prstClr-1.html
-  class PresetColor < OOXMLObject
+  class CT_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')
@@ -238,16 +238,16 @@ module RubyXL
 
   # 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)
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_clrScheme-1.html
-  class ColorScheme < OOXMLObject
+  class CT_ColorScheme < OOXMLObject
     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')
@@ -283,34 +283,598 @@ module RubyXL
     define_child_node(RubyXL::CT_TextFont,         :node_name => 'a:latin')
     define_child_node(RubyXL::CT_TextFont,         :node_name => 'a:ea')
     define_child_node(RubyXL::CT_TextFont,         :node_name => 'a:cs')
-    define_child_node(RubyXL::CT_SupplementalFont, :node_name => 'a:font', :collection => true)
+    define_child_node(RubyXL::CT_SupplementalFont, :node_name => 'a:font', :collection => [0..-1])
     define_child_node(RubyXL::AExtensionStorageArea)
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_fontScheme-1.html
   class FontScheme < OOXMLObject
+    # -- Sequence [1..1]
     define_child_node(RubyXL::CT_FontCollection, :node_name => 'a:majorFont')
     define_child_node(RubyXL::CT_FontCollection, :node_name => 'a:minorFont')
     define_child_node(RubyXL::AExtensionStorageArea)
+    # --
     define_attribute(:name, :string, :required => true)
     define_element_name 'a:fontScheme'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_gs-1.html
+  class CT_GradientStop < OOXMLObject
+    # -- Choice [1..1] (EG_ColorChoice)
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
+    # --
+    define_attribute(:pos, :int, :required => true)
+    define_element_name 'a:gs'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_gsLst-1.html
+  class CT_GradientStopList < OOXMLContainerObject
+    define_child_node(RubyXL::CT_GradientStop, :collection => [2..-1])
+    define_element_name 'a:gsLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_lin-1.html
+  class CT_LinearShadeProperties < OOXMLObject
+    define_attribute(:ang,    :int)
+    define_attribute(:scaled, :bool)
+    define_element_name 'a:lin'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_tileRect-1.html
+  class CT_RelativeRect < OOXMLObject
+    define_attribute(:l, :int, :default => 0)
+    define_attribute(:t, :int, :default => 0)
+    define_attribute(:r, :int, :default => 0)
+    define_attribute(:b, :int, :default => 0)
+    define_element_name 'a:tileRect'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_path-1.html
+  class CT_PathShadeProperties < OOXMLObject
+    define_child_node(CT_RelativeRect, :node_name => 'a:fillToRect')
+    define_attribute(:path, RubyXL::ST_PathShadeType)
+    define_element_name 'a:path'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_gradFill-1.html
+  class CT_GradientFillProperties < OOXMLObject
+    define_child_node(RubyXL::CT_GradientStopList)
+    define_child_node(RubyXL::CT_LinearShadeProperties)
+    define_child_node(RubyXL::CT_PathShadeProperties)
+    define_child_node(RubyXL::CT_RelativeRect)
+    define_attribute(:flip,         RubyXL::ST_TileFlipMode)
+    define_attribute(:rotWithShape, :bool)
+    define_element_name 'a:gradFill'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_pattFill-1.html
+  class CT_PatternFillProperties < OOXMLObject
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:fgClr')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:bgClr')
+    define_attribute(:prst, RubyXL::ST_PresetPatternVal)
+    define_element_name 'a:pattFill'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_tile-1.html
+  class CT_TileInfoProperties < OOXMLObject
+    define_attribute(:tx,    :int)
+    define_attribute(:ty,    :int)
+    define_attribute(:sx,    :int)
+    define_attribute(:sy,    :int)
+    define_attribute(:flip,  RubyXL::ST_TileFlipMode)
+    define_attribute(:align, RubyXL::ST_RectAlignment)
+    define_element_name 'a:tile'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_stretch-1.html
+  class CT_StretchInfoProperties < OOXMLObject
+    define_child_node(RubyXL::CT_RelativeRect, :node_name => 'a:fillRect')
+    define_element_name 'a:stretch'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_TintEffect.html
+  class CT_TintEffect < OOXMLObject
+    define_attribute(:hue, :int, :default => 0)
+    define_attribute(:amt, :int, :default => 0)
+    define_element_name 'a:tint'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_HSLEffect.html
+  class CT_HSLEffect < OOXMLObject
+    define_attribute(:hue, :int, :default => 0)
+    define_attribute(:sat, :int, :default => 0)
+    define_attribute(:lum, :int, :default => 0)
+    define_element_name 'a:hsl'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_LuminanceEffect.html
+  class CT_LuminanceEffect < OOXMLObject
+    define_attribute(:bright,   :int, :default => 0)
+    define_attribute(:contrast, :int, :default => 0)
+    define_element_name 'a:lum'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_AlphaBiLevelEffect.html
+  class CT_AlphaBiLevelEffect < OOXMLObject
+    define_attribute(:thresh, :int, :required => true)
+    define_element_name 'a:alphaBiLevel'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_AlphaModulateFixedEffect.html
+  class CT_AlphaModulateFixedEffect < OOXMLObject
+    define_attribute(:amt, :int, :default => 100000)
+    define_element_name 'a:alphaModFix'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_AlphaReplaceEffect.html
+  class CT_AlphaReplaceEffect < OOXMLObject
+    define_attribute(:a, :int, :required => true)
+    define_element_name 'a:alphaRepl'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_BiLevelEffect.html
+  class CT_BiLevelEffect < OOXMLObject
+    define_attribute(:thresh, :int, :required => true, :default => 100000)
+    define_element_name 'a:biLevel'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_BlurEffect.html
+  class CT_BlurEffect < OOXMLObject
+    define_attribute(:rad,  :int,  :default => 0)
+    define_attribute(:grow, :bool, :default => true)
+    define_element_name 'a:blur'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_DuotoneEffect.html
+  class CT_DuotoneEffect < OOXMLObject
+    define_attribute(:rad,  :int,  :default => 0)
+    define_attribute(:grow, :bool, :default => true)
+    define_element_name 'a:blur'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_ColorChangeEffect.html
+  class CT_ColorChangeEffect < OOXMLObject
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:clrFrom')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:clrTo')
+    define_attribute(:useA, :bool, :default => true)
+    define_element_name 'a:clrChange'
+  end
+
+  class CT_EffectContainer < OOXMLObject
+    # Defining class here without actually filling the OOXML definitions
+    # so it can reference itself in the actual definition.
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_alphaMod-2.html
+  class CT_AlphaModulateEffect < OOXMLObject
+    define_child_node(RubyXL::CT_EffectContainer, :node_name => :cont)
+    define_element_name 'a:alphaMod'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_blend-1.html
+  class CT_BlendEffect < OOXMLObject
+    define_child_node(RubyXL::CT_EffectContainer, :node_name => :cont)
+    define_attribute(:blend, RubyXL::ST_BlendMode, :required => true)
+    define_element_name 'a:blend'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_effect-1.html
+  class CT_EffectReference < OOXMLObject
+    define_attribute(:ref, :string)
+    define_element_name 'a:effect'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_alphaOutset-1.html
+  class CT_AlphaOutsetEffect < OOXMLObject
+    define_attribute(:rad, :int, :default => 0)
+    define_element_name 'a:alphaOutset'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_blip-1.html
+  class CT_Blip < OOXMLObject
+    define_child_node(RubyXL::CT_AlphaBiLevelEffect)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:alphaCeiling')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:alphaFloor')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:alphaInv')
+    define_child_node(RubyXL::CT_AlphaModulateEffect)
+    define_child_node(RubyXL::CT_AlphaModulateFixedEffect)
+    define_child_node(RubyXL::CT_AlphaReplaceEffect)
+    define_child_node(RubyXL::CT_BiLevelEffect)
+    define_child_node(RubyXL::CT_BlurEffect)
+    define_child_node(RubyXL::CT_ColorChangeEffect)
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:clrRepl')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:duotone')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:fillOverlay')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grayscl')
+    define_child_node(RubyXL::CT_HSLEffect)
+    define_child_node(RubyXL::CT_LuminanceEffect)
+    define_child_node(RubyXL::CT_TintEffect)
+    define_attribute(:'r:embed', :string)
+    define_attribute(:'r:link',  :string)
+    define_attribute(:cstate,    RubyXL::ST_BlipCompression)
+    define_element_name 'a:blip'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_blipFill-1.html
+  class CT_BlipFillProperties < OOXMLObject
+    define_child_node(RubyXL::CT_Blip)
+    define_child_node(RubyXL::CT_RelativeRect, :node_name => 'a:srcRect')
+    define_child_node(RubyXL::CT_TileInfoProperties)
+    define_child_node(RubyXL::CT_StretchInfoProperties)
+    define_attribute(:dpi,          :int)
+    define_attribute(:rotWithShape, :bool)
+    define_element_name 'a:blipFill'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_fill-1.html
+  class CT_FillEffect < OOXMLObject
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:noFill')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:solidFill')
+    define_child_node(RubyXL::CT_GradientFillProperties)
+    define_child_node(RubyXL::CT_BlipFillProperties)
+    define_child_node(RubyXL::CT_PatternFillProperties)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grpFill')
+    define_element_name 'a:fill'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_fillOverlay-1.html
+  class CT_FillOverlayEffect < OOXMLObject
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:noFill')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:solidFill')
+    define_child_node(RubyXL::CT_GradientFillProperties)
+    define_child_node(RubyXL::CT_BlipFillProperties)
+    define_child_node(RubyXL::CT_PatternFillProperties)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grpFill')
+    define_attribute(:blend, RubyXL::ST_BlendMode)
+    define_element_name 'a:fillOverlay'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_GlowEffect.html
+  class CT_GlowEffect < OOXMLObject
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
+    define_attribute(:rad, :int, :default => 0)
+    define_element_name 'a:glow'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_InnerShadowEffect.html
+  class CT_InnerShadowEffect < OOXMLObject
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
+    define_attribute(:blurRad, :int, :default => 0)
+    define_attribute(:dist,    :int, :default => 0)
+    define_attribute(:dir,     :int, :default => 0)
+    define_element_name 'a:innerShdw'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_OuterShadowEffect.html
+  class CT_OuterShadowEffect < OOXMLObject
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
+    define_attribute(:blurRad,      :int,  :default => 0)
+    define_attribute(:dist,         :int,  :default => 0)
+    define_attribute(:dir,          :int,  :default => 0)
+    define_attribute(:sx,           :int,  :default => 100000)
+    define_attribute(:sy,           :int,  :default => 100000)
+    define_attribute(:kx,           :int,  :default => 0)
+    define_attribute(:ky,           :int,  :default => 0)
+    define_attribute(:algn,         RubyXL::ST_RectAlignment, :default => 'b')
+    define_attribute(:rotWithShape, :bool, :default => true)
+    define_element_name 'a:outerShdw'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_prstShdw-1.html
+  class CT_PresetShadowEffect < OOXMLObject
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
+    define_attribute(:prst, RubyXL::ST_PresetShadowVal, :required => true)
+    define_attribute(:dist, :int, :default => 0)
+    define_attribute(:dir,  :int, :default => 0)
+    define_element_name 'a:prstShdw'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_reflection-1.html
+  class CT_ReflectionEffect < OOXMLObject
+    define_attribute(:blurRad,      :int,  :default => 0)
+    define_attribute(:stA,          :int,  :default => 100000)
+    define_attribute(:stPos,        :int,  :default => 0)
+    define_attribute(:endA,         :int,  :default => 0)
+    define_attribute(:endPos,       :int,  :default => 100000)
+    define_attribute(:dist,         :int,  :default => 0)
+    define_attribute(:dir,          :int,  :default => 0)
+    define_attribute(:fadeDir,      :int,  :default => 5400000)
+    define_attribute(:sx,           :int,  :default => 100000)
+    define_attribute(:sy,           :int,  :default => 100000)
+    define_attribute(:kx,           :int,  :default => 0)
+    define_attribute(:ky,           :int,  :default => 0)
+    define_attribute(:algn,         RubyXL::ST_RectAlignment, :default => 'b')
+    define_attribute(:rotWithShape, :bool, :default => true)
+    define_element_name 'a:reflection'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_relOff-1.html
+  class CT_RelativeOffsetEffect < OOXMLObject
+    define_attribute(:tx, :int)
+    define_attribute(:ty, :int)
+    define_element_name 'a:relOff'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_softEdge-1.html
+  class CT_SoftEdgesEffect < OOXMLObject
+    define_attribute(:rad, :int, :required => true)
+    define_element_name 'a:softEdge'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_TransformEffect.html
+  class CT_TransformEffect < OOXMLObject
+    define_attribute(:sx, :int, :default => 100000)
+    define_attribute(:sy, :int, :default => 100000)
+    define_attribute(:kx, :int, :default => 0)
+    define_attribute(:ky, :int, :default => 0)
+    define_attribute(:tx, :int, :default => 0)
+    define_attribute(:ty, :int, :default => 0)
+    define_element_name 'a:xfrm'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_EffectContainer.html
+  class CT_EffectContainer < OOXMLObject
+    define_child_node(RubyXL::CT_EffectContainer, :node_name => 'a:cont')
+    define_child_node(RubyXL::CT_EffectReference)
+    define_child_node(RubyXL::CT_AlphaBiLevelEffect)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:alphaCeiling')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:alphaFloor')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:alphaInv')
+    define_child_node(RubyXL::CT_AlphaModulateEffect)
+    define_child_node(RubyXL::CT_AlphaModulateFixedEffect)
+    define_child_node(RubyXL::CT_AlphaOutsetEffect)
+    define_child_node(RubyXL::CT_AlphaReplaceEffect)
+    define_child_node(RubyXL::CT_BiLevelEffect)
+    define_child_node(RubyXL::CT_BlendEffect)
+    define_child_node(RubyXL::CT_BlurEffect)
+    define_child_node(RubyXL::CT_ColorChangeEffect)
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:clrRepl')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:duotone')
+    define_child_node(RubyXL::CT_FillEffect)
+    define_child_node(RubyXL::CT_FillOverlayEffect)
+    define_child_node(RubyXL::CT_GlowEffect)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grayscl')
+    define_child_node(RubyXL::CT_HSLEffect)
+    define_child_node(RubyXL::CT_InnerShadowEffect)
+    define_child_node(RubyXL::CT_LuminanceEffect)
+    define_child_node(RubyXL::CT_OuterShadowEffect)
+    define_child_node(RubyXL::CT_PresetShadowEffect)
+    define_child_node(RubyXL::CT_ReflectionEffect)
+    define_child_node(RubyXL::CT_RelativeOffsetEffect)
+    define_child_node(RubyXL::CT_SoftEdgesEffect)
+    define_child_node(RubyXL::CT_TintEffect)
+    define_child_node(RubyXL::CT_TransformEffect)
+    define_attribute(:type, RubyXL::ST_EffectContainerType, :default => 'sib')
+    define_attribute(:name, :string)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_fillStyleLst-1.html
+  class CT_FillStyleList < OOXMLObject
+    # -- Choice [3..*] (EG_FillProperties)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:noFill')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:solidFill', :collection => true)
+    define_child_node(RubyXL::CT_GradientFillProperties, :collection => true)
+    define_child_node(RubyXL::CT_BlipFillProperties,     :collection => true)
+    define_child_node(RubyXL::CT_PatternFillProperties,  :collection => true)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grpFill')
+    # --
+    define_element_name 'a:fillStyleLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_miter-1.html
+  class CT_LineJoinMiterProperties < OOXMLObject
+    define_attribute(:lim, :int)
+    define_element_name 'a:miter'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_LineEndProperties.html
+  class CT_LineEndProperties < OOXMLObject
+    define_attribute(:type, RubyXL::ST_LineEndType)
+    define_attribute(:w,    RubyXL::ST_LineEndWidth)
+    define_attribute(:len,  RubyXL::ST_LineEndLength)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_prstDash-1.html
+  class CT_PresetLineDashProperties < OOXMLObject
+    define_attribute(:val, RubyXL::ST_PresetLineDashVal)
+    define_element_name 'a:prstDash'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_DashStop.html
+  class CT_DashStop < OOXMLObject
+    define_attribute(:d,  :int, :required => true)
+    define_attribute(:sp, :int, :required => true)
+    define_element_name 'a:ds'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_DashStopList.html
+  class CT_DashStopList < OOXMLContainerObject
+    define_child_node(RubyXL::CT_DashStop, :collection => [0..-1])
+    define_element_name 'a:custDash'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_ln-1.html
+  class CT_LineProperties < OOXMLObject
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:noFill')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:solidFill')
+    define_child_node(RubyXL::CT_GradientFillProperties)
+    define_child_node(RubyXL::CT_PatternFillProperties)
+    define_child_node(RubyXL::CT_PresetLineDashProperties)
+    define_child_node(RubyXL::CT_DashStopList)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:round')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:bevel')
+    define_child_node(RubyXL::CT_LineJoinMiterProperties)
+    define_child_node(RubyXL::CT_LineEndProperties, :node_name => 'a:headEnd')
+    define_child_node(RubyXL::CT_LineEndProperties, :node_name => 'a:tailEnd')
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_attribute(:w,    :int)
+    define_attribute(:cap,  RubyXL::ST_LineCap)
+    define_attribute(:cmpd, RubyXL::ST_CompoundLine)
+    define_attribute(:algn, RubyXL::ST_PenAlignment)
+    define_element_name 'a:ln'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_lnStyleLst-1.html
+  class CT_LineStyleList < OOXMLContainerObject
+    define_child_node(RubyXL::CT_LineProperties, :collection => [3..-1])
+    define_element_name 'a:lnStyleLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_SphereCoords.html
+  class CT_SphereCoords < OOXMLObject
+    define_attribute(:lat, :int, :required => true)
+    define_attribute(:lon, :int, :required => true)
+    define_attribute(:rev, :int, :required => true)
+    define_element_name 'a:rot'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_camera-1.html
+  class CT_Camera < OOXMLObject
+    define_child_node(RubyXL::CT_SphereCoords)
+    define_attribute(:prst, RubyXL::ST_PresetCameraType, :required => true)
+    define_attribute(:fov,  :int)
+    define_attribute(:zoom, :int, :default => 100000)
+    define_element_name 'a:camera'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_lightRig-1.html
+  class CT_LightRig < OOXMLObject
+    define_child_node(RubyXL::CT_SphereCoords)
+    define_attribute(:rig, RubyXL::ST_LightRigType,      :required => true)
+    define_attribute(:dir, RubyXL::ST_LightRigDirection, :required => true)
+    define_element_name 'a:lightRig'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_anchor-1.html
+  class CT_Point3D < OOXMLObject
+    define_attribute(:x, :int, :required => true)
+    define_attribute(:y, :int, :required => true)
+    define_attribute(:z, :int, :required => true)
+    define_element_name 'a:anchor'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_Vector3D.html
+  class CT_Vector3D < OOXMLObject
+    define_attribute(:dx, :int, :required => true)
+    define_attribute(:dy, :int, :required => true)
+    define_attribute(:dz, :int, :required => true)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_Backdrop.html
+  class CT_Backdrop < OOXMLObject
+    define_child_node(RubyXL::CT_Point3D)
+    define_child_node(RubyXL::CT_Vector3D, :node_name => 'a:norm')
+    define_child_node(RubyXL::CT_Vector3D, :node_name => 'a:up')
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_element_name 'a:backdrop'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_scene3d-1.html
+  class CT_Scene3D < OOXMLObject
+    define_child_node(RubyXL::CT_Camera,   :required => true)
+    define_child_node(RubyXL::CT_LightRig, :required => true)
+    define_child_node(RubyXL::CT_Backdrop)
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_element_name 'a:scene3d'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_Bevel.html
+  class CT_Bevel < OOXMLObject
+    define_attribute(:w,    :int, :default => 76200)
+    define_attribute(:h,    :int, :default => 76200)
+    define_attribute(:prst, RubyXL::ST_BevelPresetType)
+    define_element_name 'a:CT_Bevel'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_sp3d-1.html
+  class CT_Shape3D < OOXMLObject
+    define_child_node(RubyXL::CT_Bevel, :node_name => 'a:bevelT')
+    define_child_node(RubyXL::CT_Bevel, :node_name => 'a:bevelB')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:extrusionClr')
+    define_child_node(RubyXL::CT_Color, :node_name => 'a:contourClr')
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_attribute(:z,            :int, :default => 0)
+    define_attribute(:extrusionH,   :int, :default => 0)
+    define_attribute(:contourW,     :int, :default => 0)
+    define_attribute(:prstMaterial, RubyXL::ST_PresetMaterialType, :default => 'warmMatte')
+    define_element_name 'a:sp3d'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_blur-1.html
+  class CT_BlurEffect < OOXMLObject
+    define_attribute(:rad,  :int,  :default => 0)
+    define_attribute(:grow, :bool, :default => true)
+    define_element_name 'a:blur'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_effectLst-1.html
+  class CT_EffectList < OOXMLObject
+    define_child_node(RubyXL::CT_BlurEffect)
+    define_child_node(RubyXL::CT_FillOverlayEffect)
+    define_child_node(RubyXL::CT_GlowEffect)
+    define_child_node(RubyXL::CT_InnerShadowEffect)
+    define_child_node(RubyXL::CT_OuterShadowEffect)
+    define_child_node(RubyXL::CT_PresetShadowEffect)
+    define_child_node(RubyXL::CT_ReflectionEffect)
+    define_child_node(RubyXL::CT_SoftEdgesEffect)
+    define_element_name 'a:effectLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_effectStyle-1.html
+  class CT_EffectStyleItem < OOXMLObject
+    define_child_node(RubyXL::CT_EffectList)
+    define_child_node(RubyXL::CT_EffectContainer, :node_name => 'a:effectDag')
+    define_child_node(RubyXL::CT_Scene3D)
+    define_child_node(RubyXL::CT_Shape3D)
+    define_element_name 'a:effectStyle'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_effectStyleLst-1.html
+  class CT_EffectStyleList < OOXMLContainerObject
+    define_child_node(RubyXL::CT_EffectStyleItem, :collection => [3..-1])
+    define_element_name 'a:effectStyleLst'
+  end
+
   # http://www.schemacentral.com/sc/ooxml/e-a_fmtScheme-1.html
-  class FormatScheme < OOXMLObject
-#    a:fillStyleLst [1..1]    Fill Style List
-#    a:lnStyleLst [1..1]    Line Style List
-#    a:effectStyleLst [1..1]    Effect Style List
-#    a:bgFillStyleLst [1..1]    Background Fill Style List    define_element_name 'a:fontScheme'
+  class CT_StyleMatrix < OOXMLObject
+    define_child_node(RubyXL::CT_FillStyleList,   :required => true)
+    define_child_node(RubyXL::CT_LineStyleList,   :required => true)
+    define_child_node(RubyXL::CT_EffectStyleList, :required => true)
+    define_child_node(RubyXL::CT_FillStyleList,   :required => true, :node_name => 'a:bgFillStyleLst')
     define_attribute(:name, :string)
     define_element_name 'a:fmtScheme'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_themeElements-1.html
   class ThemeElements < OOXMLObject
-    define_child_node(RubyXL::ColorScheme)
+    define_child_node(RubyXL::CT_ColorScheme)
     define_child_node(RubyXL::FontScheme)
-    define_child_node(RubyXL::FormatScheme)
+    define_child_node(RubyXL::CT_StyleMatrix)
     define_child_node(RubyXL::AExtensionStorageArea)
     define_element_name 'a:themeElements'
   end
@@ -330,7 +894,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_xfrm-4.html
-  class TwoDTransform < OOXMLObject
+  class CT_Transform2D < OOXMLObject
     define_attribute(:rot,   :int,  :default => 0)
     define_attribute(:flipH, :bool, :default => false)
     define_attribute(:flipV, :bool, :default => false)
@@ -348,7 +912,7 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-a_avLst-1.html
   class CT_GeomGuideList < OOXMLContainerObject
-    define_child_node(RubyXL::ShapeGuide, :collection => true)
+    define_child_node(RubyXL::ShapeGuide, :collection => [0..-1])
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_rect-1.html
@@ -370,9 +934,9 @@ module RubyXL
   # http://www.schemacentral.com/sc/ooxml/t-a_CT_PolarAdjustHandle.html
   class CT_XYAdjustHandle < OOXMLObject
     define_child_node(RubyXL::CT_AdjPoint2D)
-    define_attribute(:gdRefX,   :string)
-    define_attribute(:minX,     :int)
-    define_attribute(:maxX,     :int)
+    define_attribute(:gdRefX, :string)
+    define_attribute(:minX,   :int)
+    define_attribute(:maxX,   :int)
     define_attribute(:gdRefY, :string)
     define_attribute(:minY,   :int)
     define_attribute(:maxY,   :int)
@@ -407,7 +971,7 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-a_cxnLst-1.html
   class CT_ConnectionSiteList < OOXMLContainerObject
-    define_child_node(RubyXL::CT_ConnectionSite, :collection => true)
+    define_child_node(RubyXL::CT_ConnectionSite, :collection => [0..-1])
     define_element_name 'a:cxnLst'
   end
 
@@ -427,13 +991,13 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-a_quadBezTo-1.html
   class CT_Path2DQuadBezierTo < OOXMLContainerObject
-    define_child_node(RubyXL::CT_AdjPoint2D, :collection => true, :node_name => 'a:pt')
+    define_child_node(RubyXL::CT_AdjPoint2D, :collection => [2..2], :node_name => 'a:pt')
     define_element_name 'a:quadBezTo'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_quadBezTo-1.html
   class CT_Path2DCubicBezierTo < OOXMLContainerObject
-    define_child_node(RubyXL::CT_AdjPoint2D, :collection => true, :node_name => 'a:pt')
+    define_child_node(RubyXL::CT_AdjPoint2D, :collection => [2..2], :node_name => 'a:pt')
     define_element_name 'a:cubicBezTo'
   end
 
@@ -455,7 +1019,7 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-a_pathLst-1.html
   class CT_Path2DList < OOXMLContainerObject
-    define_child_node(RubyXL::CT_Path2D, :collection => true)
+    define_child_node(RubyXL::CT_Path2D, :collection => [0..-1])
     define_element_name 'a:pathLst'
   end
 
@@ -479,75 +1043,335 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-a_spPr-1.html
   class VisualProperties < OOXMLObject
-    define_child_node(RubyXL::TwoDTransform)
+    define_child_node(RubyXL::CT_Transform2D)
+    # -- Choice [0..1] (EG_Geometry)
     define_child_node(RubyXL::CustomGeometry)
     define_child_node(RubyXL::PresetGeometry)
-#        a:noFill    No Fill
-#        a:solidFill    Solid Fill
-#        a:gradFill    Gradient Fill
-#        a:blipFill    Picture Fill
-#        a:pattFill    Pattern Fill
-#        a:grpFill    Group Fill
-#    a:ln [0..1]    
-#        a:effectLst    Effect Container
-#        a:effectDag    Effect Container
-#    a:scene3d [0..1]    3-D Scene
-#    a:sp3d [0..1]    3-D Shape Properties
-#    a:extLst [0..1]    Extension List
+    # -- Choice [0..1] (EG_FillProperties)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:noFill')
+    define_child_node(RubyXL::CT_Color,     :node_name => 'a:solidFill')
+    define_child_node(RubyXL::CT_GradientFillProperties)
+    define_child_node(RubyXL::CT_BlipFillProperties)
+    define_child_node(RubyXL::CT_PatternFillProperties)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grpFill')
+    # --
+    define_child_node(RubyXL::CT_LineProperties)
+    # -- Choice [0..1] (EG_EffectProperties)
+    define_child_node(RubyXL::CT_EffectList)
+    define_child_node(RubyXL::CT_EffectContainer, :node_name => 'a:effectDag')
+    # --
+    define_child_node(RubyXL::CT_Scene3D)
+    define_child_node(RubyXL::CT_Shape3D)
+    define_child_node(RubyXL::AExtensionStorageArea)
     define_attribute(:bwMode, RubyXL::ST_BlackWhiteMode)
+    define_element_name 'a:spPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_prstTxWarp-2.html
+  class CT_PresetTextShape < OOXMLObject
+    define_child_node(RubyXL::CT_GeomGuideList, :node_name => 'a:avLst')
+    define_attribute(:prst, RubyXL::ST_TextShapeType)
+    define_element_name 'a:prstTxWarp'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_normAutofit-1.html
+  class CT_TextNormalAutofit < OOXMLObject
+    define_attribute(:fontScale,      :int, :default => 100000)
+    define_attribute(:lnSpcReduction, :int, :default => 0)
+    define_element_name 'a:normAutofit'
+  end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_flatTx-1.html
+  class CT_FlatText < OOXMLObject
+    define_attribute(:z, :int, :default => 0)
+    define_element_name 'a:flatTx'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_bodyPr-1.html
+  class BodyProperties < OOXMLObject
+    define_child_node(RubyXL::CT_PresetTextShape)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:noAutofit')
+    define_child_node(RubyXL::CT_TextNormalAutofit)
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:spAutoFit')
+    define_child_node(RubyXL::CT_Scene3D)
+    define_child_node(RubyXL::CT_Shape3D)
+    define_child_node(RubyXL::CT_FlatText)
     define_child_node(RubyXL::AExtensionStorageArea)
-    define_element_name 'a:spPr'
+    define_attribute(:rot, :int)
+    define_attribute(:spcFirstLastPara, :bool)
+    define_attribute(:vertOverflow,     RubyXL::ST_TextVertOverflowType)
+    define_attribute(:horzOverflow,     RubyXL::ST_TextHorzOverflowType)
+    define_attribute(:vert,             RubyXL::ST_TextVerticalType)
+    define_attribute(:wrap,             RubyXL::ST_TextWrappingType)
+    define_attribute(:lIns,             :int)
+    define_attribute(:tIns,             :int)
+    define_attribute(:rIns,             :int)
+    define_attribute(:bIns,             :int)
+    define_attribute(:numCol,           :int)
+    define_attribute(:spcCol,           :int)
+    define_attribute(:rtlCol,           :bool)
+    define_attribute(:fromWordArt,      :bool)
+    define_attribute(:anchor,           RubyXL::ST_TextAnchoringType)
+    define_attribute(:anchorCtr,        :bool)
+    define_attribute(:forceAA,          :bool)
+    define_attribute(:upright,          :bool, :default => false)
+    define_attribute(:compatLnSpc,      :bool)
+    define_element_name 'a:bodyPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_tab-1.html
+  class CT_TextTabStop < OOXMLObject
+    define_attribute(:pos,  :int)
+    define_attribute(:algn, RubyXL::ST_TextTabAlignType)
+    define_element_name 'a:tabLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_tabLst-1.html
+  class CT_TextTabStopList < OOXMLContainerObject
+    define_child_node(RubyXL::CT_TextTabStop, :collection => [0..32])
+    define_element_name 'a:tabLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_buAutoNum-1.html
+  class CT_TextAutonumberBullet < OOXMLObject
+    define_attribute(:type, RubyXL::ST_TextAutonumberScheme)
+    define_attribute(:startAt, :int)
+    define_element_name 'a:buAutoNum'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_buChar-1.html
+  class CT_TextCharBullet < OOXMLObject
+    define_attribute(:char, :string, :required => true)
+    define_element_name 'a:buChar'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_buBlip-1.html
+  class CT_TextBlipBullet < OOXMLObject
+    define_child_node(RubyXL::CT_Blip)
+    define_element_name 'a:buBlip'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_TextSpacing.html
+  class CT_TextSpacing < OOXMLObject
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:spcPct')
+    define_child_node(RubyXL::IntegerValue, :node_name => 'a:spcPts')
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_snd-1.html
+  class CT_EmbeddedWAVAudioFile < OOXMLObject
+    define_attribute(:'r:embed', :string)
+    define_attribute(:name,      :string, :default => '')
+    define_attribute(:builtIn,   :bool,   :default => false)
+    define_element_name 'a:snd'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_Hyperlink.html
+  class CT_Hyperlink < OOXMLObject
+    define_child_node(RubyXL::CT_EmbeddedWAVAudioFile)
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_attribute(:'r:id',         :string)
+    define_attribute(:invalidUrl,     :string, :default => '')
+    define_attribute(:action,         :string, :default => '')
+    define_attribute(:tgtFrame,       :string, :default => '')
+    define_attribute(:tooltip,        :string, :default => '')
+    define_attribute(:history,        :bool,   :default => true)
+    define_attribute(:highlightClick, :bool,   :default => false)
+    define_attribute(:endSnd,         :bool,   :default => false)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_defRPr-1.html
+  class CT_TextCharacterProperties < OOXMLObject
+    define_child_node(RubyXL::CT_LineProperties)
+    # -- EG_FillProperties
+    define_child_node(RubyXL::BooleanValue,      :node_name => 'a:noFill')
+    define_child_node(RubyXL::CT_Color,          :node_name => 'a:solidFill')
+    define_child_node(RubyXL::CT_GradientFillProperties)
+    define_child_node(RubyXL::CT_BlipFillProperties)
+    define_child_node(RubyXL::CT_PatternFillProperties)
+    define_child_node(RubyXL::BooleanValue,      :node_name => 'a:grpFill')
+    # -- EG_EffectProperties
+    define_child_node(RubyXL::CT_EffectList)
+    define_child_node(RubyXL::CT_EffectContainer, :node_name => 'a:effectDag')
+    # --
+    define_child_node(RubyXL::CT_Color,          :node_name => 'a:highlight')
+    # -- EG_TextUnderlineLine
+    define_child_node(RubyXL::BooleanValue,      :node_name => 'a:uLnTx')
+    define_child_node(RubyXL::CT_LineProperties, :node_name => 'a:uLn')
+    # -- EG_TextUnderlineFill
+    define_child_node(RubyXL::BooleanValue,      :node_name => 'a:uFillTx')
+    define_child_node(RubyXL::CT_FillStyleList,  :node_name => 'a:uFill')
+    define_child_node(RubyXL::CT_TextFont,       :node_name => 'a:latin')
+    define_child_node(RubyXL::CT_TextFont,       :node_name => 'a:ea')
+    define_child_node(RubyXL::CT_TextFont,       :node_name => 'a:cs')
+    define_child_node(RubyXL::CT_TextFont,       :node_name => 'a:sym')
+    define_child_node(RubyXL::CT_Hyperlink,      :node_name => 'a:hlinkClick')
+    define_child_node(RubyXL::CT_Hyperlink,      :node_name => 'a:hlinkMouseOver')
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_attribute(:kumimoji,   :bool)
+    define_attribute(:lang,       :string)
+    define_attribute(:altLang,    :string)
+    define_attribute(:sz,         :int)
+    define_attribute(:b,          :bool)
+    define_attribute(:i,          :bool)
+    define_attribute(:u,          RubyXL::ST_TextUnderlineType)
+    define_attribute(:strike,     RubyXL::ST_TextStrikeType)
+    define_attribute(:kern,       :int)
+    define_attribute(:cap,        RubyXL::ST_TextCapsType)
+    define_attribute(:spc,        :int)
+    define_attribute(:normalizeH, :bool)
+    define_attribute(:baseline,   :int)
+    define_attribute(:noProof,    :bool)
+    define_attribute(:dirty,      :bool, :default => true)
+    define_attribute(:err,        :bool, :default => false)
+    define_attribute(:smtClean,   :bool, :default => true)
+    define_attribute(:smtId,      :int,  :default => 0)
+    define_attribute(:bmk,        :string)
+    define_element_name 'a:defRPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_defPPr-1.html     define_child_node(RubyXL::CT_TextSpacing, :node_name => 'a:lnSpc')
+ class CT_TextParagraphProperties < OOXMLObject
+    define_child_node(RubyXL::CT_TextSpacing, :node_name => 'a:spcBef')
+    define_child_node(RubyXL::CT_TextSpacing, :node_name => 'a:spcAft')
+    define_child_node(RubyXL::BooleanValue,   :node_name => 'a:buClrTx')
+    define_child_node(RubyXL::CT_Color,       :node_name => 'a:buClr')
+    define_child_node(RubyXL::BooleanValue,   :node_name => 'a:buSzTx')
+    define_child_node(RubyXL::IntegerValue,   :node_name => 'a:buSzPct')
+    define_child_node(RubyXL::IntegerValue,   :node_name => 'a:buSzPts')
+    define_child_node(RubyXL::BooleanValue,   :node_name => 'a:buFontTx')
+    define_child_node(RubyXL::CT_TextFont,    :node_name => 'a:buFont')
+    define_child_node(RubyXL::BooleanValue,   :node_name => 'a:buNone')
+    define_child_node(RubyXL::CT_TextAutonumberBullet)
+    define_child_node(RubyXL::CT_TextCharBullet)
+    define_child_node(RubyXL::CT_TextBlipBullet)
+    define_child_node(RubyXL::CT_TextTabStop)
+    define_child_node(RubyXL::CT_TextCharacterProperties)
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_attribute(:marL,         :int)
+    define_attribute(:marR,         :int)
+    define_attribute(:lvl,          :int)
+    define_attribute(:indent,       :int)
+    define_attribute(:algn,         RubyXL::ST_TextAlignType)
+    define_attribute(:defTabSz,     :int)
+    define_attribute(:rtl,          :bool)
+    define_attribute(:eaLnBrk,      :bool)
+    define_attribute(:fontAlgn,     RubyXL::ST_TextFontAlignType)
+    define_attribute(:latinLnBrk,   :bool)
+    define_attribute(:hangingPunct, :bool)
+    define_element_name 'a:defPPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_lstStyle-1.html
+  class CT_TextListStyle < OOXMLObject
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:defPPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl1pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl2pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl3pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl4pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl5pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl6pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl7pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl8pPr')
+    define_child_node(RubyXL::CT_TextParagraphProperties, :node_name => 'a:lvl9pPr')
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_element_name 'a:lstStyle'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_StyleMatrixReference.html
+  class CT_StyleMatrixReference < OOXMLObject
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
+    define_attribute(:idx, :int, :required => true)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_FontReference.html
+  class CT_FontReference < OOXMLObject
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
+    define_attribute(:idx, RubyXL::ST_FontCollectionIndex, :required => true)
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-a_spDef-1.html
-  class ShapeDefault < OOXMLObject
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_ShapeStyle.html
+  class CT_ShapeStyle < OOXMLObject
+    define_child_node(RubyXL::CT_StyleMatrixReference, :node_name => 'a:lnRef')
+    define_child_node(RubyXL::CT_StyleMatrixReference, :node_name => 'a:fillRef')
+    define_child_node(RubyXL::CT_StyleMatrixReference, :node_name => 'a:effectRef')
+    define_child_node(RubyXL::CT_FontReference,        :node_name => 'a:fontRef')
+    define_element_name 'a:style'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_DefaultShapeDefinition.html
+  class CT_DefaultShapeDefinition < OOXMLObject
     define_child_node(RubyXL::VisualProperties)
-#    a:bodyPr [1..1]    BodyProperties
-#    a:lstStyle [1..1]    TextListStyles
-#    a:style [0..1]    Shape Style
+    define_child_node(RubyXL::BodyProperties)
+    define_child_node(RubyXL::CT_TextListStyle)
+    define_child_node(RubyXL::CT_ShapeStyle)
     define_child_node(RubyXL::AExtensionStorageArea)
-    define_element_name 'a:spDef'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_objectDefaults-1.html
-  class ObjectDefaults < OOXMLObject
-    define_child_node(RubyXL::ShapeDefault)
-#    a:spDef [0..1]    
-#    a:lnDef [0..1]    LineDefault
-#    a:txDef [0..1]    TextDefault
+  class CT_ObjectStyleDefaults < OOXMLObject
+    define_child_node(RubyXL::CT_DefaultShapeDefinition, :node_name => 'a:spDef')
+    define_child_node(RubyXL::CT_DefaultShapeDefinition, :node_name => 'a:lnDef')
+    define_child_node(RubyXL::CT_DefaultShapeDefinition, :node_name => 'a:txDef')
     define_child_node(RubyXL::AExtensionStorageArea)
     define_element_name 'a:objectDefaults'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_clrMap-1.html
+  class CT_ColorMapping < OOXMLObject
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_attribute(:bg1,      RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:tx1,      RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:bg2,      RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:tx2,      RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:accent1,  RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:accent2,  RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:accent3,  RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:accent4,  RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:accent5,  RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:accent6,  RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:hlink,    RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_attribute(:golHlink, RubyXL::ST_ColorSchemeIndex, :required => true)
+    define_element_name 'a:clrMap'
+  end
+
   # http://www.schemacentral.com/sc/ooxml/e-a_extraClrScheme-1.html
-  class ExtraColorScheme < OOXMLObject
-#    a:clrScheme [1..1]    ColorScheme
-#    a:clrMap [0..1]    ColorMap
+  class CT_ColorSchemeAndMapping < OOXMLObject
+    define_child_node(RubyXL::CT_ColorScheme)
+    define_child_node(RubyXL::CT_ColorMapping)
     define_element_name 'a:extraClrScheme'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_extraClrSchemeLst-1.html
   class ExtraColorSchemeList < OOXMLContainerObject
-    define_child_node(RubyXL::ExtraColorScheme, :collection => true)
+    define_child_node(RubyXL::CT_ColorSchemeAndMapping, :collection => [0..-1])
     define_element_name 'a:extraClrSchemeLst'
   end
   
   # http://www.schemacentral.com/sc/ooxml/e-a_custClr-1.html
   class CustomColor < 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)
+    define_child_node(RubyXL::CT_ScRgbColor)
+    define_child_node(RubyXL::CT_SRgbColor)
+    define_child_node(RubyXL::CT_HslColor)
+    define_child_node(RubyXL::CT_SystemColor)
+    define_child_node(RubyXL::CT_SchemeColor)
+    define_child_node(RubyXL::CT_PresetColor)
     define_attribute(:name, :string, :default => '')
     define_element_name 'a:custClr'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_custClrLst-1.html
   class CustomColorList < OOXMLContainerObject
-    define_child_node(RubyXL::CustomColor, :collection => true)
+    define_child_node(RubyXL::CustomColor, :collection => [0..-1])
     define_element_name 'a:custClrLst'
   end
 
@@ -555,7 +1379,7 @@ module RubyXL
   class Theme < OOXMLTopLevelObject
     define_attribute(:name, :string, :default => '')
     define_child_node(RubyXL::ThemeElements)
-    define_child_node(RubyXL::ObjectDefaults)
+    define_child_node(RubyXL::CT_ObjectStyleDefaults)
     define_child_node(RubyXL::ExtraColorSchemeList)
     define_child_node(RubyXL::CustomColorList)
     define_child_node(RubyXL::AExtensionStorageArea)
@@ -573,27 +1397,8 @@ module RubyXL
     end
 
 
-    ###### Temporary storage of the theme until I'm done with fully implementing
-    ###### all of its intricacies
-    attr_accessor :raw_xml
-
-    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
-      
-      # Making sure that the file will be automatically closed immediately after it has been read
-      obj.raw_xml = File.open(full_path, 'r') { |f| f.read }
-      obj
-    end
-
-    def write_xml
-      raw_xml || # Use fallback theme.
-        '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    def self.defaults
+      default_theme = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
 <a:themeElements>
 <a:clrScheme name="Office">
@@ -909,9 +1714,8 @@ module RubyXL
 </a:objectDefaults>
 <a:extraClrSchemeLst/>
 </a:theme>'
-
+      self.parse(default_theme)
     end
-    ######
 
   end