thinreports 0.7.6 → 0.8.0

data/examples/word_wrap/word_wrap.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+example :word_wrap, 'Word-wrap property of TextBlock' do |t|
+  Thinreports::Report.generate filename: t.output_filename do
+    use_layout t.layout_filename
+    start_new_page
+
+    page.item(:locale).value('ja')
+
+    text = 'Thinreports は Ruby 向けのオープンソース帳票・PDF ツールです。'
+    page.values single_none: text,
+                single_break_word: text,
+                multiple_none: text,
+                multiple_break_word: text
+
+    start_new_page
+
+    page.item(:locale).value('en')
+
+    text = 'Thinreports is the OSS reporting tool for Ruby-lang.'
+    page.values single_none: text,
+                single_break_word: text,
+                multiple_none: text,
+                multiple_break_word: text
+  end
+end

data/examples/word_wrap/word_wrap.tlf

@@ -0,0 +1 @@
+{"version":"0.7.7.1","finger-print":1936329983,"config":{"title":"","option":{},"page":{"paper-type":"A4","orientation":"portrait","margin-top":"20","margin-bottom":"20","margin-left":"20","margin-right":"20"}},"svg":"<svg width=\"595.2\" height=\"841.8\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" preserveAspectRatio=\"none\" viewBox=\"0 0 595.2 841.8\"><g class=\"canvas\"><!--SHAPE{\"type\":\"s-tblock\",\"id\":\"single_none\",\"display\":\"true\",\"desc\":null,\"multiple\":\"false\",\"valign\":\"\",\"line-height\":\"\",\"box\":{\"x\":33.1,\"y\":101,\"width\":210.1,\"height\":17},\"format\":{\"base\":\"\",\"type\":\"\"},\"value\":\"\",\"ref-id\":\"\",\"overflow\":\"expand\",\"word-wrap\":\"none\",\"svg\":{\"tag\":\"text\",\"attrs\":{\"x\":33.1,\"y\":113.9,\"xml:space\":\"preserve\",\"xmlns\":\"http://www.w3.org/2000/svg\",\"kerning\":\"auto\",\"id\":\"goog_478710130\",\"fill\":\"#000000\",\"fill-opacity\":\"1\",\"font-size\":\"18\",\"font-family\":\"Helvetica\",\"font-weight\":\"normal\",\"font-style\":\"normal\",\"text-anchor\":\"start\",\"text-decoration\":\"none\"}}}SHAPE--><!--LAYOUT<g xmlns=\"http://www.w3.org/2000/svg\" class=\"s-tblock\" x-format-type=\"\" x-value=\"\" x-format-base=\"\" x-ref-id=\"\" kerning=\"auto\" x-display=\"true\" x-multiple=\"false\" id=\"goog_478710130\" x-id=\"single_none\" fill=\"#000000\" fill-opacity=\"1\" font-size=\"18\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-anchor=\"start\" text-decoration=\"none\" x-width=\"210.1\" x-height=\"17\" x-left=\"33.1\" x-top=\"101\" x-overflow=\"expand\"><rect class=\"s-tblock-box\" stroke=\"#7C4007\" fill=\"#f4e2c4\" stroke-width=\"0.28\" fill-opacity=\"0.8\" width=\"210.1\" height=\"17\" x=\"33.1\" y=\"101\"/><text class=\"s-tblock-id\" font-size=\"11\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" kerning=\"auto\" stroke=\"none\" fill=\"#7C4007\" fill-opacity=\"1\" x=\"35.1\" y=\"112\">single_none</text></g>LAYOUT--><!--SHAPE{\"type\":\"s-tblock\",\"id\":\"multiple_none\",\"display\":\"true\",\"desc\":null,\"multiple\":\"true\",\"valign\":\"\",\"line-height\":\"\",\"box\":{\"x\":290.2,\"y\":101.9,\"width\":259.1,\"height\":105.1},\"format\":{\"base\":\"\",\"type\":\"\"},\"value\":\"\",\"ref-id\":\"\",\"overflow\":\"\",\"word-wrap\":\"none\",\"svg\":{\"tag\":\"textArea\",\"attrs\":{\"x\":290.2,\"y\":101.8,\"width\":259.1,\"height\":105.1,\"xml:space\":\"preserve\",\"xmlns\":\"http://www.w3.org/2000/svg\",\"kerning\":\"auto\",\"id\":\"goog_478710131\",\"fill\":\"#000000\",\"fill-opacity\":\"1\",\"font-size\":\"18\",\"font-family\":\"Helvetica\",\"font-weight\":\"normal\",\"font-style\":\"normal\",\"text-anchor\":\"start\",\"text-decoration\":\"none\"}}}SHAPE--><!--LAYOUT<g xmlns=\"http://www.w3.org/2000/svg\" class=\"s-tblock\" x-format-type=\"\" x-value=\"\" x-format-base=\"\" x-ref-id=\"\" kerning=\"auto\" x-display=\"true\" x-multiple=\"true\" id=\"goog_478710131\" x-id=\"multiple_none\" fill=\"#000000\" fill-opacity=\"1\" font-size=\"18\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-anchor=\"start\" text-decoration=\"none\" x-width=\"259.1\" x-height=\"105.1\" x-left=\"290.2\" x-top=\"101.9\" x-word-wrap=\"none\"><rect class=\"s-tblock-box\" stroke=\"#7C4007\" fill=\"#f4e2c4\" stroke-width=\"0.28\" fill-opacity=\"0.8\" width=\"259.1\" height=\"105.1\" x=\"290.2\" y=\"101.9\"/><text class=\"s-tblock-id\" font-size=\"11\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" kerning=\"auto\" stroke=\"none\" fill=\"#7C4007\" fill-opacity=\"1\" x=\"292.2\" y=\"112.9\">multiple_none</text></g>LAYOUT--><rect stroke=\"#000000\" stroke-width=\"1\" fill=\"none\" fill-opacity=\"1\" class=\"s-rect\" x-display=\"true\" x-stroke-type=\"solid\" stroke-dasharray=\"none\" x-id=\"\" rx=\"0\" ry=\"0\" id=\"goog_1119358811\" width=\"259.1\" height=\"105.1\" x=\"290.2\" y=\"101.9\"/><!--SHAPE{\"type\":\"s-tblock\",\"id\":\"multiple_break_word\",\"display\":\"true\",\"desc\":null,\"multiple\":\"true\",\"valign\":\"\",\"line-height\":\"\",\"box\":{\"x\":290.2,\"y\":232.9,\"width\":259.1,\"height\":105.1},\"format\":{\"base\":\"\",\"type\":\"\"},\"value\":\"\",\"ref-id\":\"\",\"overflow\":\"truncate\",\"word-wrap\":\"break-word\",\"svg\":{\"tag\":\"textArea\",\"attrs\":{\"x\":290.2,\"y\":232.8,\"width\":259.1,\"height\":105.1,\"xml:space\":\"preserve\",\"xmlns\":\"http://www.w3.org/2000/svg\",\"kerning\":\"auto\",\"id\":\"goog_1119358812\",\"fill\":\"#000000\",\"fill-opacity\":\"1\",\"font-size\":\"18\",\"font-family\":\"Helvetica\",\"font-weight\":\"normal\",\"font-style\":\"normal\",\"text-decoration\":\"none\",\"text-anchor\":\"start\"}}}SHAPE--><!--LAYOUT<g xmlns=\"http://www.w3.org/2000/svg\" class=\"s-tblock\" x-format-type=\"\" x-value=\"\" x-format-base=\"\" x-ref-id=\"\" kerning=\"auto\" x-display=\"true\" x-multiple=\"true\" id=\"goog_1119358812\" x-id=\"multiple_break_word\" x-width=\"259.1\" x-height=\"105.1\" x-left=\"290.2\" x-top=\"232.9\" fill=\"#000000\" fill-opacity=\"1\" font-size=\"18\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" x-overflow=\"truncate\" x-word-wrap=\"break-word\"><rect class=\"s-tblock-box\" stroke=\"#7C4007\" fill=\"#f4e2c4\" stroke-width=\"0.28\" fill-opacity=\"0.8\" width=\"259.1\" height=\"105.1\" x=\"290.2\" y=\"232.9\"/><text class=\"s-tblock-id\" font-size=\"11\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" kerning=\"auto\" stroke=\"none\" fill=\"#7C4007\" fill-opacity=\"1\" x=\"292.2\" y=\"243.9\">multiple_break_word</text></g>LAYOUT--><rect stroke=\"#000000\" stroke-width=\"1\" fill=\"none\" fill-opacity=\"1\" class=\"s-rect\" x-display=\"true\" x-stroke-type=\"solid\" stroke-dasharray=\"none\" x-id=\"\" rx=\"0\" ry=\"0\" id=\"goog_1119358813\" width=\"259.1\" height=\"105.1\" x=\"290.2\" y=\"232.9\"/><line stroke=\"#000000\" stroke-width=\"1\" fill=\"none\" class=\"s-line\" x-display=\"true\" x-stroke-type=\"solid\" stroke-dasharray=\"none\" x-id=\"\" id=\"goog_1119358814\" x1=\"252\" x2=\"252\" y1=\"100\" y2=\"379.1\"/><!--SHAPE{\"type\":\"s-tblock\",\"id\":\"single_break_word\",\"display\":\"true\",\"desc\":null,\"multiple\":\"false\",\"valign\":\"\",\"line-height\":\"\",\"box\":{\"x\":35,\"y\":235,\"width\":210.1,\"height\":17},\"format\":{\"base\":\"\",\"type\":\"\"},\"value\":\"\",\"ref-id\":\"\",\"overflow\":\"expand\",\"word-wrap\":\"break-word\",\"svg\":{\"tag\":\"text\",\"attrs\":{\"x\":35,\"y\":247.9,\"xml:space\":\"preserve\",\"xmlns\":\"http://www.w3.org/2000/svg\",\"kerning\":\"auto\",\"id\":\"goog_1119358815\",\"fill\":\"#000000\",\"fill-opacity\":\"1\",\"font-size\":\"18\",\"font-family\":\"Helvetica\",\"font-weight\":\"normal\",\"font-style\":\"normal\",\"text-decoration\":\"none\",\"text-anchor\":\"start\"}}}SHAPE--><!--LAYOUT<g xmlns=\"http://www.w3.org/2000/svg\" class=\"s-tblock\" x-format-type=\"\" x-value=\"\" x-format-base=\"\" x-ref-id=\"\" kerning=\"auto\" x-display=\"true\" x-multiple=\"false\" id=\"goog_1119358815\" x-id=\"single_break_word\" x-width=\"210.1\" x-height=\"17\" x-left=\"35\" x-top=\"235\" fill=\"#000000\" fill-opacity=\"1\" font-size=\"18\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" x-overflow=\"expand\" x-word-wrap=\"break-word\"><rect class=\"s-tblock-box\" stroke=\"#7C4007\" fill=\"#f4e2c4\" stroke-width=\"0.28\" fill-opacity=\"0.8\" width=\"210.1\" height=\"17\" x=\"35\" y=\"235\"/><text class=\"s-tblock-id\" font-size=\"11\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" kerning=\"auto\" stroke=\"none\" fill=\"#7C4007\" fill-opacity=\"1\" x=\"37\" y=\"246\">single_break_word</text></g>LAYOUT--><g class=\"s-text\" stroke-width=\"0\" fill=\"#000000\" fill-opacity=\"1\" kerning=\"auto\" x-display=\"true\" x-id=\"\" id=\"goog_1119358816\" font-size=\"18\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-anchor=\"start\" text-decoration=\"none\" x-width=\"58\" x-height=\"17\" x-left=\"32.1\" x-top=\"36\"><rect class=\"s-text-box\" stroke=\"none\" fill=\"#000000\" fill-opacity=\"0.001\" width=\"58\" height=\"17\" x=\"32.1\" y=\"36\"/><text class=\"s-text-l0\" xml:space=\"preserve\" stroke=\"none\" fill=\"inherit\" fill-opacity=\"1\" text-decoration=\"none\" x=\"32.1\" y=\"48.9\">Locale:</text></g><!--SHAPE{\"type\":\"s-tblock\",\"id\":\"locale\",\"display\":\"true\",\"desc\":null,\"multiple\":\"false\",\"valign\":\"\",\"line-height\":\"\",\"box\":{\"x\":100,\"y\":36,\"width\":145.1,\"height\":17},\"format\":{\"base\":\"\",\"type\":\"\"},\"value\":\"\",\"ref-id\":\"\",\"overflow\":\"\",\"word-wrap\":\"none\",\"svg\":{\"tag\":\"text\",\"attrs\":{\"x\":100,\"y\":48.9,\"xml:space\":\"preserve\",\"xmlns\":\"http://www.w3.org/2000/svg\",\"kerning\":\"auto\",\"id\":\"goog_1119358817\",\"fill\":\"#000000\",\"fill-opacity\":\"1\",\"font-size\":\"18\",\"font-family\":\"Helvetica\",\"font-weight\":\"normal\",\"font-style\":\"normal\",\"text-anchor\":\"start\",\"text-decoration\":\"none\"}}}SHAPE--><!--LAYOUT<g xmlns=\"http://www.w3.org/2000/svg\" class=\"s-tblock\" x-format-type=\"\" x-value=\"\" x-format-base=\"\" x-ref-id=\"\" kerning=\"auto\" x-display=\"true\" x-multiple=\"false\" id=\"goog_1119358817\" x-id=\"locale\" fill=\"#000000\" fill-opacity=\"1\" font-size=\"18\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-anchor=\"start\" text-decoration=\"none\" x-width=\"145.1\" x-height=\"17\" x-left=\"100\" x-top=\"36\"><rect class=\"s-tblock-box\" stroke=\"#7C4007\" fill=\"#f4e2c4\" stroke-width=\"0.28\" fill-opacity=\"0.8\" width=\"145.1\" height=\"17\" x=\"100\" y=\"36\"/><text class=\"s-tblock-id\" font-size=\"11\" font-family=\"Helvetica\" font-weight=\"normal\" font-style=\"normal\" text-decoration=\"none\" text-anchor=\"start\" kerning=\"auto\" stroke=\"none\" fill=\"#7C4007\" fill-opacity=\"1\" x=\"102\" y=\"47\">locale</text></g>LAYOUT--><rect stroke=\"#000000\" stroke-width=\"1\" fill=\"none\" fill-opacity=\"1\" class=\"s-rect\" x-display=\"true\" x-stroke-type=\"solid\" stroke-dasharray=\"none\" x-id=\"\" rx=\"0\" ry=\"0\" id=\"goog_1119358818\" width=\"210.1\" height=\"17\" x=\"33.1\" y=\"101\"/><rect stroke=\"#000000\" stroke-width=\"1\" fill=\"none\" fill-opacity=\"1\" class=\"s-rect\" x-display=\"true\" x-stroke-type=\"solid\" stroke-dasharray=\"none\" x-id=\"\" rx=\"0\" ry=\"0\" id=\"goog_1119358820\" width=\"210.1\" height=\"17\" x=\"34.1\" y=\"235\"/></g></svg>","state":{"layout-guide":[{"type":"x","position":59.5},{"type":"y","position":61}]}}

data/lib/thinreports/config.rb

@@ -1,21 +1,41 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   # @yield [config]
-  # @yieldparam [ThinReports::Configuration] config
+  # @yieldparam [Thinreports::Configuration] config
   def self.configure(&block)
-    block_exec_on(self.config, &block)
+    Thinreports.call_block_in(self.config, &block)
   end
-  
-  # @return [ThinReports::Configuration]
+
+  # @return [Thinreports::Configuration]
   def self.config
-    @config ||= ThinReports::Configuration.new
+    @config ||= Thinreports::Configuration.new
   end
-  
+
   class Configuration
-    # @return [ThinReports::Generator::Configuration]
+    def initialize
+      @fallback_fonts = []
+    end
+
+    # @return [Array<String>]
+    # @example
+    #   config.fallback_fonts # => ['Times New Roman', '/path/to/font.ttf']
+    def fallback_fonts
+      @fallback_fonts ||= []
+    end
+
+    # @param [Array<String>,String] font_names
+    # @example
+    #   config.fallback_fonts = 'Times New Roman'
+    #   config.fallback_fonts = '/path/to/font.ttf'
+    #   config.fallback_fonts = ['/path/to/font.ttf', 'IPAGothic']
+    def fallback_fonts=(font_names)
+      @fallback_fonts = font_names.is_a?(Array) ? font_names : [font_names]
+    end
+
+    # @return [Thinreports::Generator::Configuration]
     def generator
-      @generator ||= ThinReports::Generator::Configuration.new
+      @generator ||= Thinreports::Generator::Configuration.new
     end
   end
-end
+end

data/lib/thinreports/core/errors.rb

@@ -1,71 +1,74 @@
 # coding: utf-8
 
-module ThinReports
-  
+module Thinreports
+
   module Errors
     class Basic < ::StandardError
     end
-    
+
     class UnknownShapeStyleName < Basic
       def initialize(style, availables)
         super("The specified style name, '#{style}', cannot be used. " +
               "The available styles are #{availables.map{|s| ":#{s}"}.join(', ')}.")
       end
     end
-    
+
     class UnknownShapeType < Basic
     end
-    
+
     class UnknownFormatterType < Basic
     end
-    
+
     class LayoutFileNotFound < Basic
     end
-    
+
+    class FontFileNotFound < Basic
+    end
+
     class NoRegisteredLayoutFound < Basic
     end
-    
+
     class UnknownItemId < Basic
       def initialize(id, item_type = 'Basic')
         super("The layout does not have a #{item_type} Item with id '#{id}'.")
       end
     end
-    
+
     class DisabledListSection < Basic
       def initialize(section)
         super("The #{section} section is disabled.")
       end
     end
-    
+
     class UnknownEventType < Basic
     end
-    
+
     class UnknownLayoutId < Basic
     end
-    
+
     class UnknownGeneratorType < Basic
       def initialize(type)
         super("The specified generator type, '#{type}', was not found.")
       end
     end
-    
+
     class NoConfigurationFound < Basic
     end
-    
+
     class UnsupportedColorName < Basic
     end
-    
+
     class InvalidLayoutFormat < Basic
     end
-    
+
     class IncompatibleLayoutFormat < Basic
       def initialize(filename, fileversion, required_rules)
-        super("Generator #{ThinReports::VERSION} can not be built this file, " +
-              "'#{File.basename(filename)}'." +
+        super("Generator #{Thinreports::VERSION} can not be built this file, " +
+              "'#{File.basename(filename)}'. " +
               "This file is updated in the Editor of version '#{fileversion}', " +
               "but Generator requires version #{required_rules}.")
-      end      
+      end
     end
   end
-    
+
 end

data/lib/thinreports/core/events.rb

@@ -1,27 +1,28 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core
-    
+
     class Events
+      include Utils
+
       Event = ::Struct.new(:type, :target)
-      
-      # @return [Hash<Symbol, ThinReports::Core::Events::Event>]
-      # @private
+
+      # @return [Hash<Symbol, Thinreports::Core::Events::Event>]
       attr_accessor :events
-      
+
       # @param [Symbol] types
       def initialize(*types)
         @events = {}
         @types  = types
       end
-      
+
       # @param [Symbol] type
       # @yield [e]
-      # @yieldparam [ThinReports::Core::Events::Event] e
+      # @yieldparam [Thinreports::Core::Events::Event] e
       def listen(type, &block)
         verify_event_type(type)
-        
+
         if block_given?
           events[type] = block
         else
@@ -29,14 +30,13 @@ module ThinReports
         end
       end
       alias_method :on, :listen
-      
+
       # @param [Symbol] type
       def unlisten(type)
         events.delete(type)
       end
       alias_method :un, :unlisten
-      
-      # @private
+
       def dispatch(e)
         unless e.type
           raise ArgumentError, 'Event#type attribute is required'
@@ -47,22 +47,21 @@ module ThinReports
           event.call(e)
         end
       end
-      
-      # @private
+
       def copy
         new_events = self.dup
-        new_events.events = events.simple_deep_copy
+        new_events.events = deep_copy(events)
         new_events
       end
-      
+
     private
-      
+
       # @param [Symbol] type
       def verify_event_type(type)
         return if @types.empty?
-        
+
         unless @types.include?(type)
-          raise ThinReports::Errors::UnknownEventType
+          raise Thinreports::Errors::UnknownEventType
         end
       end
     end

data/lib/thinreports/core/format/base.rb

@@ -1,57 +1,52 @@
 # coding: utf-8
+require 'thinreports/core/format/builder'
+
+module Thinreports::Core
+  module Format
 
-module ThinReports
-  module Core::Format
-    
     # @abstract
-    # @private
     class Base
-      # Work like a BlankSlate.
-      instance_methods.each do |m|
-        undef_method(m) unless m.to_s =~ /^(object|eq|__|instance_|=|!)/
-      end
-      
+      extend Format::Builder
+
       class << self
-        include Core::Format::Builder
-        
         def config_reader(*configs, &block)
           each_configs(*configs) do |m, location|
             define_read_method(m, location, &block)
           end
         end
-        
+
         def config_checker(check, *configs)
           checker = lambda {|val| val == check}
           each_configs(*configs) do |m, location|
             define_read_method(:"#{m}?", location, &checker)
           end
         end
-        
+
         def config_writer(*configs)
           each_configs(*configs) do |m, location|
             define_write_method(m, location)
           end
         end
-        
+
         def config_accessor(*configs, &block)
           config_reader(*configs, &block)
           config_writer(*configs)
         end
-        
+
         private
-        
+
         def define_read_method(m, location = nil, &block)
           define_method(m) do
             read(*location, &block)
           end
         end
-        
+
         def define_write_method(m, location = nil)
           define_method(:"#{m}=") do |value|
             write(value, *location)
           end
         end
-        
+
         def each_configs(*configs, &block)
           c = configs.first.is_a?(::Hash) ? configs.first : (configs || [])
           c.each do |m, location|
@@ -59,14 +54,14 @@ module ThinReports
           end
         end
       end
-      
+
       def initialize(config, &block)
         @config = config
         block.call(self) if ::Kernel.block_given?
       end
-      
+
       private
-      
+
       def find(*keys)
         if keys.empty?
           @config
@@ -76,18 +71,18 @@ module ThinReports
           end
         end
       end
-      
+
       def write(value, *keys)
         key = keys.pop
         owner = find(*keys)
         owner[key] = value
       end
-      
+
       def read(*keys, &block)
         value = find(*keys)
         ::Kernel.block_given? ? block.call(value) : value
       end
     end
-    
+
   end
-end
+end

data/lib/thinreports/core/format/builder.rb

@@ -1,61 +1,53 @@
 # coding: utf-8
 
-begin
-  require 'json'
-rescue LoadError
-  puts 'ThinReports requires json >= 1.4.6. ' +
-       'Please `gem install json` and try again.'
-end
+require 'json'
+
+module Thinreports::Core
+  module Format
 
-module ThinReports
-  module Core::Format
-    
-    # @private
     module Builder
       def build(*args)
         build_internal(*args)
-      rescue ThinReports::Errors::Basic => e
-        raise e
+      rescue Thinreports::Errors::Basic => e
+        raise
       rescue => e
-        raise ThinReports::Errors::InvalidLayoutFormat
+        raise Thinreports::Errors::InvalidLayoutFormat
       end
-      
-    private
-      
+
       # @abstract
       def build_internal(*args)
         raise NotImplementedError
       end
 
-      # @param [ThinReports::Core::Format::Base] format
+      # @param [Thinreports::Core::Format::Base] format
       # @param [Hash] options
       def build_layout(format, options = {}, &block)
         level = '-' * ((options[:level] || 1 ) - 1)
+        pattern = /<!--#{level}SHAPE(.*?)SHAPE#{level}-->/
 
-        format.layout.gsub!(/<!--#{level}SHAPE(.*?)SHAPE#{level}-->/) do
-          shape_format = block.call(*parsed_format_and_shape_type($1))
-          
+        format.layout.scan(pattern) do |m|
+          shape_format = block.call(*parsed_format_and_shape_type(m.first))
           format.shapes[shape_format.id.to_sym] = shape_format
-          shape_tag(shape_format)
         end
+        format.layout.gsub!(pattern, '')
       end
-      
+
       # @param [String] svg
       def clean(svg)
         svg.gsub!(/<!--.*?-->/, '')
       end
-      
+
       # @param [String] svg
       def clean_with_attributes(svg)
         clean(svg)
         svg.gsub!(/ x\-[a-z\d\-]+?=".*?"/, '')
-        svg.gsub!(/ class=".*?"/, '')        
+        svg.gsub!(/ class=".*?"/, '')
       end
-      
+
       def shape_tag(format)
         %{<%= r(:"#{format.id}")%>}
       end
-      
+
       def parsed_format_and_shape_type(json_string)
         f = parse_json(json_string)
         [ f['type'], f ]
@@ -65,6 +57,6 @@ module ThinReports
         JSON.parse(json_string)
       end
     end
-    
+
   end
 end

data/lib/thinreports/core/shape/base/interface.rb

@@ -1,38 +1,38 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     # @abstract
     class Base::Interface
-      extend ::Forwardable
-      
+      include Utils
+      extend  Forwardable
+
       def self.internal_delegators(*args)
         def_delegators :internal, *args
       end
       private_class_method :internal_delegators
-      
+
       attr_reader :internal
-      
+
       def initialize(parent, format, internal = nil)
         @internal = internal || init_internal(parent, format)
       end
-      
+
       def copy(parent)
         self.class.new(parent, internal.format, internal.copy(parent))
       end
-      
+
     private
-    
-      # @param [ThinReports::Core::Page, ThinReports::Core::Shape::List::SectionInterface] parent
-      # @param [ThinReports::Core::Shape::Basic::Format] format
-      # @return [ThinReports::Core::Shape::Basic::Internal]
+
+      # @param [Thinreports::Report::Page, Thinreports::Core::Shape::List::SectionInterface] parent
+      # @param [Thinreports::Core::Shape::Basic::Format] format
+      # @return [Thinreports::Core::Shape::Basic::Internal]
       # @abstract
       def init_internal(parent, format)
         raise NotImplementedError
       end
     end
-    
+
   end
-end
+end

data/lib/thinreports/core/shape/base/internal.rb

@@ -1,54 +1,49 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     # @abstract
     class Base::Internal
-      extend ::Forwardable
-      
+      include Utils
+      extend  Forwardable
+
       def self.format_delegators(*args)
         def_delegators :format, *args
       end
       private_class_method :format_delegators
-      
+
       attr_reader :parent
       attr_reader :format
       attr_writer :style
       attr_accessor :states
-      
+
       def initialize(parent, format)
         @parent = parent
         @format = format
         @states = {}
         @style  = nil
-        
+
         @finalized_attributes = nil
       end
-      
+
       def style
         raise NotImplementedError
       end
-      
+
       def copy(new_parent, &block)
         new_internal = self.class.new(new_parent, format)
         new_internal.style  = style.copy
-        new_internal.states = states.simple_deep_copy
-        
+        new_internal.states = deep_copy(states)
+
         block.call(new_internal) if block_given?
         new_internal
       end
-      
-      def switch_parent!(new_parent)
-        @parent = new_parent
-        self
-      end
-      
+
       def type_of?(type_name)
         raise NotImplementedError
       end
     end
-    
+
   end
-end
+end

data/lib/thinreports/core/shape/base.rb

@@ -2,15 +2,14 @@
 
 require 'forwardable'
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     module Base
     end
-    
+
   end
 end
 
 require 'thinreports/core/shape/base/internal'
-require 'thinreports/core/shape/base/interface'
+require 'thinreports/core/shape/base/interface'

data/lib/thinreports/core/shape/basic/block_format.rb

@@ -1,12 +1,11 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     class Basic::BlockFormat < Basic::Format
       config_reader :value, :box
     end
-    
+
   end
 end