lib/caracal/document.rb in caracal-1.0.9 vs lib/caracal/document.rb in caracal-1.0.10
- old
+ new
@@ -1,17 +1,20 @@
require 'open-uri'
require 'zip'
+require 'caracal/core/custom_properties'
require 'caracal/core/file_name'
require 'caracal/core/fonts'
+require 'caracal/core/iframes'
+require 'caracal/core/ignorables'
require 'caracal/core/images'
require 'caracal/core/list_styles'
require 'caracal/core/lists'
+require 'caracal/core/namespaces'
require 'caracal/core/page_breaks'
require 'caracal/core/page_numbers'
require 'caracal/core/page_settings'
-require 'caracal/core/custom_properties'
require 'caracal/core/relationships'
require 'caracal/core/rules'
require 'caracal/core/styles'
require 'caracal/core/tables'
require 'caracal/core/text'
@@ -36,20 +39,23 @@
#-------------------------------------------------------------
# Configuration
#-------------------------------------------------------------
# mixins (order is important)
- include Caracal::Core::FileName
include Caracal::Core::CustomProperties
-
+ include Caracal::Core::FileName
+ include Caracal::Core::Ignorables
+ include Caracal::Core::Namespaces
include Caracal::Core::Relationships
+
include Caracal::Core::Fonts
include Caracal::Core::PageSettings
include Caracal::Core::PageNumbers
include Caracal::Core::Styles
include Caracal::Core::ListStyles
+ include Caracal::Core::IFrames
include Caracal::Core::Images
include Caracal::Core::Lists
include Caracal::Core::PageBreaks
include Caracal::Core::Rules
include Caracal::Core::Tables
@@ -96,10 +102,10 @@
page_size
page_margins top: 1440, bottom: 1440, left: 1440, right: 1440
page_numbers
- [:relationship, :font, :style, :list_style].each do |method|
+ [:font, :list_style, :namespace, :relationship, :style].each do |method|
collection = self.class.send("default_#{ method }s")
collection.each do |item|
send(method, item)
end
end