rubyXL 2.1.1 → 2.2.0

data/lib/rubyXL/objects/relationships.rb

@@ -2,6 +2,10 @@ require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
 
+  class RID < OOXMLObject
+    define_attribute(:'r:id',            :string, :required => true)
+  end
+
   class Relationship < OOXMLObject
     define_attribute(:Id,     :string)
     define_attribute(:Type,   :string)
@@ -10,7 +14,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_calcChain.html
-  class WorkbookRelationships < OOXMLObject
+  class WorkbookRelationships < OOXMLTopLevelObject
     define_child_node(RubyXL::Relationship, :collection => true, :accessor => :relationships)
     define_element_name 'Relationships'
     set_namespaces('xmlns' => 'http://schemas.openxmlformats.org/package/2006/relationships')

data/lib/rubyXL/objects/shared_strings.rb

@@ -5,7 +5,7 @@ require 'rubyXL/objects/extensions'
 module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_sst.html
-  class SharedStringsTable < OOXMLObject
+  class SharedStringsTable < OOXMLTopLevelObject
     # According to http://msdn.microsoft.com/en-us/library/office/gg278314.aspx,
     # +count+ and +uniqueCount+ may be either both missing, or both present. Need to validate.
     define_attribute(:uniqueCount,  :int)

data/lib/rubyXL/objects/sheet_common.rb

@@ -0,0 +1,50 @@
+require 'rubyXL/objects/ooxml_object'
+
+module RubyXL
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishItem-1.html
+  class WebPublishingItem < OOXMLObject
+    define_attribute(:id,              :int,    :required => :true)
+    define_attribute(:divId,           :int,    :required => :true)
+    define_attribute(:sourceType,      RubyXL::ST_WebSourceType, :required => :true)
+    define_attribute(:sourceRef,       :ref)
+    define_attribute(:sourceObject,    :string)
+    define_attribute(:destinationFile, :string, :required => :true)
+    define_attribute(:title,           :string)
+    define_attribute(:autoRepublish,   :bool,   :default => false)
+    define_element_name 'webPublishItem'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishItems-1.html
+  class WebPublishingItemContainer < OOXMLObject
+    define_child_node(RubyXL::WebPublishingItem, :collection => :with_count, :accessor => :web_items)
+    define_element_name 'webPublishItems'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_pageMargins-1.html
+  class PageMargins < OOXMLObject
+    define_attribute(:left,   :float, :required => true)
+    define_attribute(:right,  :float, :required => true)
+    define_attribute(:top,    :float, :required => true)
+    define_attribute(:bottom, :float, :required => true)
+    define_attribute(:header, :float, :required => true)
+    define_attribute(:footer, :float, :required => true)
+    define_element_name 'pageMargins'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_headerFooter-1.html
+  class HeaderFooterSettings < OOXMLObject
+    define_attribute(:differentOddEven, :bool, :default => false)
+    define_attribute(:differentFirst,   :bool, :default => false)
+    define_attribute(:scaleWithDoc,     :bool, :default => true)
+    define_attribute(:alignWithMargins, :bool, :default => true)
+    define_child_node(RubyXL::StringValue, :node_name => :oddHeader)
+    define_child_node(RubyXL::StringValue, :node_name => :oddFooter)
+    define_child_node(RubyXL::StringValue, :node_name => :evenHeader)
+    define_child_node(RubyXL::StringValue, :node_name => :evenFooter)
+    define_child_node(RubyXL::StringValue, :node_name => :firstHeader)
+    define_child_node(RubyXL::StringValue, :node_name => :firstFooter)
+    define_element_name 'headerFooter'
+  end
+
+end

data/lib/rubyXL/objects/sheet_data.rb

@@ -1,4 +1,5 @@
 require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/text'
 require 'rubyXL/objects/formula'
 
@@ -14,7 +15,7 @@ module RubyXL
   class Cell < OOXMLObject
     define_attribute(:r,   :ref)
     define_attribute(:s,   :int,    :accessor => :style_index)
-    define_attribute(:t,   :string, :accessor => :datatype, :default => 'n', :values => %w{ b n e s str inlineStr })
+    define_attribute(:t,   RubyXL::ST_CellType, :accessor => :datatype, :default => 'n', )
     define_attribute(:cm,  :int)
     define_attribute(:vm,  :int)
     define_attribute(:ph,  :bool)
@@ -59,6 +60,10 @@ module RubyXL
         workbook.shared_strings_container[raw_value.to_i]
       else 
         if is_date? then workbook.num_to_date(raw_value.to_i)
+        elsif raw_value.is_a?(String) && (raw_value =~ /^-?\d+(\.\d+(?:e[+-]\d+)?)?$/i) # Numeric
+          if $1 then raw_value.to_f
+          else raw_value.to_i
+          end
         else raw_value
         end
       end

data/lib/rubyXL/objects/simple_types.rb

@@ -0,0 +1,78 @@
+module RubyXL
+  ST_PageOrder           = %w{ downThenOver overThenDown }
+  ST_Orientation         = %w{ default portrait landscape }
+  ST_CellComments        = %w{ none asDisplayed atEnd }
+  ST_PrintError          = %w{ displayed blank dash NA }
+  ST_CfvoType            = %w{ num percent max min formula percentile }
+  ST_SheetViewType       = %w{ normal pageBreakPreview pageLayout }
+  ST_PivotAreaType       = %w{ none normal data all origin button topRight }
+  ST_Axis                = %w{ axisRow axisCol axisPage axisValues }
+  ST_BorderStyle         = %w{ none thin medium dashed dotted thick double hair
+                               mediumDashed dashDot mediumDashDot dashDotDot slantDashDot }
+  ST_HorizontalAlignment = %w{ general left center right fill justify centerContinuous distributed }
+  ST_VerticalAlignment   = %w{ top center bottom justify distributed }
+  ST_VectorBaseType      = %w{ variant i1 i2 i4 i8 ui1 ui2 ui4 ui8 r4 r8
+                               lpstr lpwstr bstr date filetime bool cy error clsid cf }
+  ST_PhoneticType        = %w{ halfwidthKatakana fullwidthKatakana Hiragana noConversion }
+  ST_PhoneticAlignment   = %w{ noControl left center distributed }
+  ST_WebSourceType       = %w{ sheet printArea autoFilter range chart pivotTable query label }
+  ST_CellType            = %w{ b n e s str inlineStr }
+  ST_GradientType        = %w{ linear path }
+  ST_PatternType         = %w{ none solid mediumGray darkGray lightGray
+                               darkHorizontal darkVertical darkDown darkUp darkGrid darkTrellis
+                               lightHorizontal lightVertical lightDown lightUp lightGrid lightTrellis
+                               gray125 gray0625 }
+  ST_Objects             = %w{ all placeholders none }
+  ST_UpdateLinks         = %w{ userSet never always }
+  ST_Visibility          = %w{ visible hidden veryHidden }
+
+  ST_DateTimeGrouping    = %w{ year month day hour minute second }
+  ST_CalendarType        = %w{ none gregorian gregorianUs japan taiwan korea hijri thai hebrew
+                               gregorianMeFrench gregorianArabic gregorianXlitEnglish gregorianXlitFrench }
+  ST_FilterOperator      = %w{ equal lessThan lessThanOrEqual notEqual greaterThanOrEqual greaterThan }
+  ST_DynamicFilterType   = %w{ null aboveAverage belowAverage tomorrow today yesterday
+                               nextWeek thisWeek lastWeek nextMonth thisMonth lastMonth
+                               nextQuarter thisQuarter lastQuarter nextYear thisYear lastYear
+                               yearToDate Q1 Q2 Q3 Q4 M1 M2 M3 M4 M5 M6 M7 M8 M9 M10 M11 M12 }
+  ST_IconSetType         = %w{ 3Arrows 3ArrowsGray 3Flags 3TrafficLights1 3TrafficLights2
+                               3Signs 3Symbols 3Symbols2 4Arrows 4ArrowsGray 4RedToBlack
+                               4Rating 4TrafficLights 5Arrows 5ArrowsGray 5Rating 5Quarters }
+  ST_SortMethod          = %w{ stroke pinYin none }
+  ST_SortBy              = %w{ value cellColor fontColor icon }
+
+  ST_CellFormulaType     = %w{ normal array dataTable shared }
+  ST_TargetScreenSize    = %w{ 544x376 640x480 720x512 800x600 1024x768 1152x882
+                               1152x900 1280x1024 1600x1200 1800x1440 1920x1200 }
+  ST_SmartTagShow        = %w{ all none noIndicator }
+
+  ST_CfType              = %w{ expression cellIs colorScale dataBar iconSet top10 uniqueValues
+                               duplicateValues containsText notContainsText beginsWith
+                               endsWith containsBlanks notContainsBlanks containsErrors
+                               notContainsErrors timePeriod aboveAverage }
+  ST_TimePeriod          = %w{ today yesterday tomorrow last7Days thisMonth
+                                lastMonth nextMonth thisWeek lastWeek nextWeek }
+  ST_CalcMode            = %w{ manual auto autoNoTable }
+  ST_RefMode             = %w{ A1 R1C1 }
+
+  ST_DvAspect            = %w{ DVASPECT_CONTENT DVASPECT_ICON }
+  ST_OleUpdate           = %w{ OLEUPDATE_ALWAYS OLEUPDATE_ONCALL }
+
+  ST_Pane                = %w{ bottomRight topRight bottomLeft topLeft }
+  ST_PaneState           = %w{ split frozen frozenSplit }
+
+  ST_Comments            = %w{ commNone commIndicator commIndAndComment }
+
+  ST_DataValidationType       = %w{ none whole decimal list date time textLength custom }
+  ST_DataValidationErrorStyle = %w{ stop warning information }
+  ST_DataValidationImeMode    = %w{ noControl off on disabled hiragana fullKatakana halfKatakana
+                                    fullAlpha halfAlpha fullHangul halfHangul }
+  ST_DataValidationOperator   = %w{ between notBetween equal notEqual lessThan lessThanOrEqual
+                                    greaterThan greaterThanOrEqual }
+
+  ST_DataConsolidateFunction  = %w{ average count countNums max min
+                                    product stdDev stdDevp sum var varp }
+
+  ST_ConditionalFormattingOperator = %w{ lessThan lessThanOrEqual equal notEqual greaterThanOrEqual greaterThan
+                                         between notBetween containsText notContains beginsWith endsWith }
+
+end

data/lib/rubyXL/objects/stylesheet.rb

@@ -139,15 +139,27 @@ module RubyXL
     define_child_node(RubyXL::Color, :collection => :true)
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
+  class IndexedColorContainer < OOXMLObject
+    define_child_node(RubyXL::Color, :collection => :true, :accessor => :indexed_colors, :node_name => :rgbColor)
+    define_element_name 'indexedColors'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_mruColors-1.html
+  class MRUColorContainer < OOXMLObject
+    define_child_node(RubyXL::Color, :collection => :true, :accessor => :mru_colors)
+    define_element_name 'mruColors'
+  end
+
   # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
   class Colors < OOXMLObject
-    define_child_node(RubyXL::ColorSet, :node_name => 'indexedColors')
-    define_child_node(RubyXL::ColorSet, :node_name => 'mruColors')
+    define_child_node(RubyXL::IndexedColorContainer, :accessor => :indexed_color_container)
+    define_child_node(RubyXL::MRUColorContainer)
     define_element_name 'colors'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_styleSheet.html
-  class Stylesheet < OOXMLObject
+  class Stylesheet < OOXMLTopLevelObject
     define_child_node(RubyXL::NumberFormatContainer, :accessor => :number_format_container)
     define_child_node(RubyXL::FontContainer,         :accessor => :font_container)
     define_child_node(RubyXL::FillContainer,         :accessor => :fill_container)

data/lib/rubyXL/objects/text.rb

@@ -1,4 +1,5 @@
 require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/container_nodes'
 
 module RubyXL
@@ -10,7 +11,7 @@ module RubyXL
     define_element_name 't'
 
     def before_write_xml
-      self.xml_space = (value && (/^\s+/.match(value) || /\s+$/.match(value))) ? 'preserve' : nil
+      self.xml_space = (value && ((value =~ /^\s/) || (value =~ /\s$/)) || value.include?("\n")) ? 'preserve' : nil
       true
     end
 
@@ -62,10 +63,8 @@ module RubyXL
   # http://www.schemacentral.com/sc/ooxml/e-ssml_phoneticPr-1.html
   class PhoneticProperties < OOXMLObject
     define_attribute(:fontId,    :int,    :required => true)
-    define_attribute(:type,      :string, :default => 'fullwidthKatakana',
-                        :values => %w{ halfwidthKatakana fullwidthKatakana Hiragana noConversion })
-    define_attribute(:alignment, :string, :default => 'left',
-                        :values => %w{ noControl left center distributed })
+    define_attribute(:type,      RubyXL::ST_PhoneticType,      :default => 'fullwidthKatakana')
+    define_attribute(:alignment, RubyXL::ST_PhoneticAlignment, :default => 'left')
     define_element_name 'phoneticPr'
   end
 

data/lib/rubyXL/objects/workbook.rb

@@ -1,4 +1,5 @@
 require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
@@ -26,16 +27,14 @@ module RubyXL
   # http://www.schemacentral.com/sc/ooxml/e-ssml_workbookPr-1.html
   class WorkbookProperties < OOXMLObject
     define_attribute(:date1904,                   :bool,   :default => false)
-    define_attribute(:showObjects,                :string, :default => 'all', :values =>
-                       %w{ all placeholders none } )
+    define_attribute(:showObjects,                RubyXL::ST_Objects, :default => 'all')
     define_attribute(:showBorderUnselectedTables, :bool,   :default => true)
     define_attribute(:filterPrivacy,              :bool,   :default => false)
     define_attribute(:promptedSolutions,          :bool,   :default => false)
     define_attribute(:showInkAnnotation,          :bool,   :default => true)
     define_attribute(:backupFile,                 :bool,   :default => false)
     define_attribute(:saveExternalLinkValues,     :bool,   :default => true)
-    define_attribute(:updateLinks,                :string, :default => 'userSet', :values =>
-                       %w{ userSet never always } )
+    define_attribute(:updateLinks,                RubyXL::ST_UpdateLinks, :default => 'userSet')
     define_attribute(:hidePivotFieldList,         :bool,   :default => false)
     define_attribute(:showPivotChartFilter,       :bool,   :default => false)
     define_attribute(:allowRefreshQuery,          :bool,   :default => false)
@@ -58,10 +57,9 @@ module RubyXL
     define_element_name 'workbookProtection'
   end
 
-
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_workbookView-1.html
   class WorkbookView < OOXMLObject
-    define_attribute(:visibility,             :string, :default => 'visible', :values =>
-                       %w{ visible hidden veryHidden } )
+    define_attribute(:visibility,             RubyXL::ST_Visibility, :default => 'visible')
     define_attribute(:minimized,              :bool,   :default => false)
     define_attribute(:showHorizontalScroll,   :bool,   :default => true)
     define_attribute(:showVerticalScroll,     :bool,   :default => true)
@@ -87,10 +85,9 @@ module RubyXL
   # http://www.schemacentral.com/sc/ooxml/e-ssml_sheet-1.html
   class Sheet < OOXMLObject
     define_attribute(:name,            :string, :required => true)
-    define_attribute(:sheetId,         :int, :required => true)
-    define_attribute(:state,             :string, :default => 'visible', :values =>
-                       %w{ visible hidden veryHidden } )
-    define_attribute(:'r:id',            :string, :required => true)
+    define_attribute(:sheetId,         :int,    :required => true)
+    define_attribute(:state,           RubyXL::ST_Visibility, :default => 'visible')
+    define_attribute(:'r:id',          :string, :required => true)
     define_element_name 'sheet'
   end
 
@@ -142,13 +139,53 @@ module RubyXL
     define_element_name 'definedNames'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_pivotCache-1.html
+  class PivotCache < OOXMLObject
+    define_attribute(:cacheId, :int,    :required => true)
+    define_attribute(:'r:id',  :string, :required => true)
+    define_element_name 'pivotCache'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_pivotCaches-1.html
+  class PivotCaches < OOXMLObject
+    define_child_node(RubyXL::PivotCache, :collection => true, :accessor => :pivot_caches)
+    define_element_name 'pivotCaches'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_oleSize-1.html
+  class OLESize < OOXMLObject
+    define_attribute(:ref, :ref, :required => true)
+    define_element_name 'oleSize'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_fileRecoveryPr-1.html
+  class FileRecoveryProperties < OOXMLObject
+    define_attribute(:autoRecover,     :bool, :default => true)
+    define_attribute(:crashSave,       :bool, :default => false)
+    define_attribute(:dataExtractLoad, :bool, :default => false)
+    define_attribute(:repairLoad,      :bool, :default => false)
+    define_element_name 'fileRecoveryPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishing-1.html
+  class WebPublishingProperties < OOXMLObject
+    define_attribute(:css,              :bool,   :default => true)
+    define_attribute(:thicket,          :bool,   :default => true)
+    define_attribute(:longFileNames,    :bool,   :default => true)
+    define_attribute(:vml,              :bool,   :default => false)
+    define_attribute(:allowPng,         :bool,   :default => false)
+    define_attribute(:targetScreenSize, RubyXL::ST_TargetScreenSize, :default => '800x600')
+    define_attribute(:dpi,              :int,    :default => 96)
+    define_attribute(:codePage,         :int)
+    define_element_name 'webPublishing'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_calcPr-1.html
   class CalculationProperties < OOXMLObject
-    define_attribute(:calcId,   :int)
-    define_attribute(:calcMode,              :string, :default => 'auto', :values =>
-                       %w{ manual auto autoNoTable } )
+    define_attribute(:calcId,                :int)
+    define_attribute(:calcMode,              RubyXL::ST_CalcMode, :default => 'auto')
     define_attribute(:fullCalcOnLoad,        :bool,   :default => false)
-    define_attribute(:refMode,               :string, :default => 'A1', :values =>
-                       %w{ A1 R1C1 } )
+    define_attribute(:refMode,               RubyXL::ST_RefMode, :default => 'A1')
     define_attribute(:iterate,               :bool,   :default => false)
     define_attribute(:iterateCount,          :int,    :default => 100)
     define_attribute(:iterateDelta,          :float,  :default => 0.001)
@@ -161,26 +198,114 @@ module RubyXL
     define_element_name 'calcPr'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishObject-1.html
+  class WebPublishObject < OOXMLObject
+    define_attribute(:id,              :int,    :required => true)
+    define_attribute(:divId,           :string, :required => true)
+    define_attribute(:sourceObject,    :string)
+    define_attribute(:destinationFile, :string, :required => true)
+    define_attribute(:title,           :string)
+    define_attribute(:autoRepublish,   :bool,   :default => false)
+    define_element_name 'webPublishObject'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishObjects-1.html
+  class WebPublishObjectContainer < OOXMLObject
+    define_child_node(RubyXL::WebPublishObject, :collection => :with_count, :node_name => :web_publish_objects)
+    define_element_name 'webPublishObjects'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagPr-1.html
+  class SmartTagProperties < OOXMLObject
+    define_attribute(:embed, :bool,   :default => false)
+    define_attribute(:show,  RubyXL::ST_SmartTagShow, :default => 'all')
+    define_element_name 'smartTagPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagType-1.html
+  class SmartTagType < OOXMLObject
+    define_attribute(:namespaceUri, :string)
+    define_attribute(:name,         :string)
+    define_attribute(:url,          :string)
+    define_element_name 'smartTagType'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagTypes-1.html
+  class SmartTagTypeContainer < OOXMLObject
+    define_child_node(RubyXL::SmartTagType, :collection => :true, :node_name => :smart_tag_types)
+    define_element_name 'smartTagTypes'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_functionGroup-1.html
+  class FunctionGroup < OOXMLObject
+    define_attribute(:name, :string)
+    define_element_name 'functionGroup'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_functionGroups-1.html
+  class FunctionGroupContainer < OOXMLObject
+    define_attribute(:builtInGroupCountpi, :int, :default => 16)
+    define_child_node(RubyXL::FunctionGroup, :collection => :true, :node_name => :function_group)
+    define_element_name 'functionGroups'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_customWorkbookView-1.html
+  class CustomWorkbookView < OOXMLObject
+    define_attribute(:name,                 :string, :required => true)
+    define_attribute(:guid,                 :string, :required => true)
+    define_attribute(:autoUpdate,           :bool,   :default => false)
+    define_attribute(:mergeInterval,        :int)
+    define_attribute(:changesSavedWin,      :bool,   :default => false)
+    define_attribute(:onlySync,             :bool,   :default => false)
+    define_attribute(:personalView,         :bool,   :default => false)
+    define_attribute(:includePrintSettings, :bool,   :default => true)
+    define_attribute(:includeHiddenRowCol,  :bool,   :default => true)
+    define_attribute(:maximized,            :bool,   :default => false)
+    define_attribute(:minimized,            :bool,   :default => false)
+    define_attribute(:showHorizontalScroll, :bool,   :default => true)
+    define_attribute(:showVerticalScroll,   :bool,   :default => true)
+    define_attribute(:showSheetTabs,        :bool,   :default => true)
+    define_attribute(:xWindow,              :int,    :default => 0)
+    define_attribute(:yWindow,              :int,    :default => 0)
+    define_attribute(:windowWidth,          :int)
+    define_attribute(:windowHeight,         :int)
+    define_attribute(:tabRatio,             :int,    :default => 600)
+    define_attribute(:activeSheetId,        :int)
+    define_attribute(:showFormulaBar,       :bool,   :default => true)
+    define_attribute(:showStatusbar,        :bool,   :default => true)
+    define_attribute(:showComments,         RubyXL::ST_Comments, :default => 'commIndicator')
+    define_attribute(:showObjects,          RubyXL::ST_Objects,  :default => 'all')
+    define_child_node(RubyXL::ExtensionStorageArea)
+    define_element_name 'customWorkbookView'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_customWorkbookViews-1.html
+  class CustomWorkbookViewContainer < OOXMLObject
+    define_child_node(RubyXL::CustomWorkbookView, :collection => true, :accessor => :custom_views)
+    define_element_name 'customWorkbookView'
+  end
+
+
   # http://www.schemacentral.com/sc/ooxml/e-ssml_workbook.html
-  class Workbook < OOXMLObject
+  class Workbook < OOXMLTopLevelObject
     define_child_node(RubyXL::FileVersion)
     define_child_node(RubyXL::FileSharing)
     define_child_node(RubyXL::WorkbookProperties, :accessor => :workbook_properties)
     define_child_node(RubyXL::WorkbookProtection)
     define_child_node(RubyXL::WorkbookViews)
     define_child_node(RubyXL::Sheets,             :accessor => :worksheet_container)
-#    ssml:functionGroups [0..1]    Function Groups
+    define_child_node(RubyXL::FunctionGroupContainer, :accessor => :function_group_container)
     define_child_node(RubyXL::ExternalReferences, :accessor => :ext_ref_container)
     define_child_node(RubyXL::DefinedNames,       :accessor => :defined_name_container)
     define_child_node(RubyXL::CalculationProperties)
-#    ssml:oleSize [0..1]    OLE Size
-#    ssml:customWorkbookViews [0..1]    Custom Workbook Views
-#    ssml:pivotCaches [0..1]    PivotCaches
-#    ssml:smartTagPr [0..1]    Smart Tag Properties
-#    ssml:smartTagTypes [0..1]    Smart Tag Types
-#    ssml:webPublishing [0..1]    Web Publishing Properties
-#    ssml:fileRecoveryPr [0..*]    File Recovery Properties
-#    ssml:webPublishObjects [0..1]    Web Publish Objects
+    define_child_node(RubyXL::OLESize)
+    define_child_node(RubyXL::CustomWorkbookViewContainer, :accessor => :custom_view_container)
+    define_child_node(RubyXL::PivotCaches, :accessor => :pivot_cache_container)
+    define_child_node(RubyXL::SmartTagProperties)
+    define_child_node(RubyXL::SmartTagTypeContainer)
+    define_child_node(RubyXL::WebPublishingProperties)
+    define_child_node(RubyXL::FileRecoveryProperties)
+    define_child_node(RubyXL::WebPublishObjectContainer)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_child_node(RubyXL::AlternateContent)