rabbit 0.6.4 → 0.9.0

data/lib/rabbit/element/block-element.rb

@@ -22,8 +22,6 @@ module Rabbit
     end
 
     module BlockElement
-      include Base
-
       def inline_element?
         false
       end

data/lib/rabbit/element/block.rb

@@ -1,15 +1,15 @@
-require 'rabbit/element/text-container-element'
-require 'rabbit/element/container-element'
-require 'rabbit/element/block-element'
+require 'rabbit/element/text-block-element'
 
 module Rabbit
   module Element
     class Container
       include ContainerElement
+      include BlockElement
     end
 
     class BlockQuote
       include ContainerElement
+      include BlockElement
       include BlockHorizontalCentering
 
       attr_reader :cite, :title
@@ -27,7 +27,7 @@ module Rabbit
     end
 
     class Paragraph
-      include TextContainerElement
+      include TextBlockElement
 
       def text
         "#{super}\n"
@@ -44,6 +44,7 @@ module Rabbit
 
     class WaitBlock
       include ContainerElement
+      include BlockElement
 
       def have_wait_tag?
         true

data/lib/rabbit/element/container-element.rb

@@ -6,9 +6,10 @@ module Rabbit
     module ContainerElement
       extend Forwardable
 
-      include BlockElement
       include Enumerable
 
+      include Base
+
       attr_reader :elements
 
       def_delegators(:@elements, :empty?, :each, :first, :last)

data/lib/rabbit/element/description-list.rb

@@ -1,10 +1,11 @@
 require 'rabbit/element/container-element'
-require 'rabbit/element/text-container-element'
+require 'rabbit/element/text-block-element'
 
 module Rabbit
   module Element
     class DescriptionList
       include ContainerElement
+      include BlockElement
 
       def to_html(generator)
         "<dl>\n#{super}\n</dl>"
@@ -13,6 +14,7 @@ module Rabbit
 
     class DescriptionListItem
       include ContainerElement
+      include BlockElement
 
       attr_reader :term, :content
 
@@ -26,7 +28,7 @@ module Rabbit
     end
 
     class DescriptionTerm
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": #{text}"
@@ -39,6 +41,7 @@ module Rabbit
 
     class DescriptionContent
       include ContainerElement
+      include BlockElement
 
       def text
         super.gsub(/^/, "  ")

data/lib/rabbit/element/enum-list.rb

@@ -1,9 +1,11 @@
 require 'rabbit/element/container-element'
+require 'rabbit/element/block-element'
 
 module Rabbit
   module Element
     class EnumList
       include ContainerElement
+      include BlockElement
 
       def to_html(generator)
         "<ol>\n#{super}\n</ol>"
@@ -12,6 +14,8 @@ module Rabbit
 
     class EnumListItem
       include ContainerElement
+      include BlockElement
+
       attr_accessor :order
 
       def to_rd

data/lib/rabbit/element/image.rb

@@ -4,6 +4,7 @@ require 'rabbit/element/block-element'
 module Rabbit
   module Element
     class Image
+      include Base
       include BlockElement
       include BlockHorizontalCentering
 
@@ -16,10 +17,19 @@ module Rabbit
       attr_reader :caption
       attr_reader :normalized_width, :normalized_height
       attr_reader :relative_width, :relative_height
+      attr_reader :relative_margin_top, :relative_margin_bottom
+      attr_reader :relative_margin_left, :relative_margin_right
+      attr_reader :relative_padding_top, :relative_padding_bottom
+      attr_reader :relative_padding_left, :relative_padding_right
 
       def initialize(filename, prop)
         @filename = filename
         super(filename, prop)
+        normalized_prop = {}
+        prop.each do |name, value|
+          normalized_prop[name.gsub(/-/, '_')] = value
+        end
+        prop = normalized_prop
         %w(caption dither_mode).each do |name|
           instance_variable_set("@#{name}", prop[name])
         end
@@ -35,6 +45,10 @@ module Rabbit
            x_dither y_dither
            normalized_width normalized_height
            relative_width relative_height
+           relative_margin_top relative_margin_bottom
+           relative_margin_left relative_margin_right
+           relative_padding_top relative_padding_bottom
+           relative_padding_left relative_padding_right
           ).each do |name|
           begin
             instance_variable_set("@#{name}", prop[name] && Integer(prop[name]))
@@ -42,6 +56,7 @@ module Rabbit
             raise InvalidImageSizeError.new(filename, name, prop[name])
           end
         end
+
         setup_draw_parameters(prop)
         resize(@width, @height)
       end
@@ -133,9 +148,34 @@ module Rabbit
         [x, y + height, w, h - height]
       end
 
+      def adjust_margin(w, h)
+        @margin_top =
+          make_relative_size(@relative_margin_top, h) || @margin_top
+        @margin_bottom =
+          make_relative_size(@relative_margin_bottom, h) || @margin_bottom
+        @margin_left =
+          make_relative_size(@relative_margin_left, w) || @margin_left
+        @margin_right =
+          make_relative_size(@relative_margin_right, w) || @margin_right
+      end
+
+      def adjust_padding(w, h)
+        @padding_top =
+          make_relative_size(@relative_padding_top, h) || @padding_top
+        @padding_bottom =
+          make_relative_size(@relative_padding_bottom, h) || @padding_bottom
+        @padding_left =
+          make_relative_size(@relative_padding_left, w) || @padding_left
+        @padding_right =
+          make_relative_size(@relative_padding_right, w) || @padding_right
+      end
+
       def adjust_size(canvas, x, y, w, h)
         base_w = w
-        base_h = (@oh || h) - @padding_top - @padding_bottom
+        base_h = @oh || h
+        adjust_margin(base_w, base_h)
+        adjust_padding(base_w, base_h)
+        base_h = base_h - @padding_top - @padding_bottom
         if @as_large_as_possible
           iw = base_w - x
           ih = base_h - y

data/lib/rabbit/element/item-list.rb

@@ -1,9 +1,11 @@
 require 'rabbit/element/container-element'
+require 'rabbit/element/block-element'
 
 module Rabbit
   module Element
     class ItemList
       include ContainerElement
+      include BlockElement
 
       def to_html(generator)
         "<ul>\n#{super}\n</ul>"
@@ -12,6 +14,7 @@ module Rabbit
 
     class ItemListItem
       include ContainerElement
+      include BlockElement
 
       def to_rd
         prefix = "* "

data/lib/rabbit/element/method-list.rb

@@ -1,5 +1,5 @@
 require 'rabbit/element/container-element'
-require 'rabbit/element/text-container-element'
+require 'rabbit/element/text-block-element'
 
 module Rabbit
   module Element
@@ -26,7 +26,7 @@ module Rabbit
     end
 
     class MethodTerm
-      include TextContainerElement
+      include TextBlockElement
 
       attr_accessor :name
     end

data/lib/rabbit/element/poppler-page.rb

@@ -3,6 +3,7 @@ require 'rabbit/element/block-element'
 module Rabbit
   module Element
     class PopplerPage
+      include Base
       include BlockElement
       include BlockHorizontalCentering
 

data/lib/rabbit/element/slide-element.rb

@@ -4,6 +4,7 @@ module Rabbit
   module Element
     module SlideElement
       include ContainerElement
+      include BlockElement
 
       attr_accessor :index, :drawing_index, :transition
       def initialize(title_element)

data/lib/rabbit/element/slide.rb

@@ -28,7 +28,7 @@ module Rabbit
     end
 
     class HeadLine
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         "= #{text}"

data/lib/rabbit/element/table.rb

@@ -1,10 +1,12 @@
 require 'rabbit/element/text-element'
 require 'rabbit/element/container-element'
+require 'rabbit/element/block-element'
 
 module Rabbit
   module Element
     class Table
       include ContainerElement
+      include BlockElement
 
       attr_reader :caption
       def initialize(prop={})
@@ -47,6 +49,7 @@ module Rabbit
 
     class TableHead
       include ContainerElement
+      include BlockElement
 
       def text
         "#{super}\n"
@@ -59,6 +62,7 @@ module Rabbit
 
     class TableBody
       include ContainerElement
+      include BlockElement
 
       def to_html(generator)
         "<tbody>\n#{super}\n</tbody>"
@@ -67,6 +71,7 @@ module Rabbit
 
     class TableRow
       include ContainerElement
+      include BlockElement
 
       def text
         super.gsub(/\n/, ", ")
@@ -82,7 +87,7 @@ module Rabbit
     end
 
     class TableHeader
-      include TextElement
+      include TextContainerElement
 
       def to_html(generator)
         "<th>#{super}</th>"
@@ -90,7 +95,7 @@ module Rabbit
     end
 
     class TableCell
-      include TextElement
+      include TextContainerElement
 
       def to_html(generator)
         "<td>#{super}</td>"

data/lib/rabbit/element/tag.rb

@@ -1,4 +1,5 @@
 require 'rabbit/element/base'
+require 'rabbit/element/text-container-element'
 
 module Rabbit
   module Element

data/lib/rabbit/element/text-block-element.rb

@@ -0,0 +1,11 @@
+require 'rabbit/element/text-container-element'
+require 'rabbit/element/block-element'
+
+module Rabbit
+  module Element
+    module TextBlockElement
+      include TextContainerElement
+      include BlockElement
+    end
+  end
+end

data/lib/rabbit/element/text-container-element.rb

@@ -70,6 +70,10 @@ module Rabbit
         super or @elements.any? {|elem| elem.have_numerical_font_size?}
       end
 
+      def inline_element?
+        true
+      end
+
       protected
       def initial_font_size_for_compute_font_size
         [

data/lib/rabbit/element/text.rb

@@ -1,6 +1,6 @@
 require 'rabbit/element/text-element'
 require 'rabbit/element/text-container-element'
-require 'rabbit/element/block-element'
+require 'rabbit/element/text-block-element'
 
 module Rabbit
   module Element
@@ -12,9 +12,12 @@ module Rabbit
       include TextContainerElement
     end
 
+    class TextBlock
+      include TextBlockElement
+    end
+
     class PreformattedBlock
-      include TextContainerElement
-      include BlockHorizontalCentering
+      include TextBlockElement
 
       def to_html(generator)
         "<pre>#{super}</pre>"

data/lib/rabbit/element/title-slide.rb

@@ -1,5 +1,5 @@
 require 'rabbit/element/slide-element'
-require 'rabbit/element/text-container-element'
+require 'rabbit/element/text-block-element'
 require 'rabbit/element/description-list'
 
 module Rabbit
@@ -80,7 +80,7 @@ module Rabbit
     end
 
     class Title
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         "= #{text}"
@@ -92,7 +92,7 @@ module Rabbit
     end
 
     class Subtitle
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": subtitle\n   #{text}"
@@ -104,7 +104,7 @@ module Rabbit
     end
 
     class Author
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": author\n   #{text}"
@@ -116,7 +116,7 @@ module Rabbit
     end
 
     class ContentSource
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": content-source\n   #{text}"
@@ -128,7 +128,7 @@ module Rabbit
     end
 
     class Institution
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": institution\n   #{text}"
@@ -140,7 +140,7 @@ module Rabbit
     end
 
     class Date
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": date\n   #{text}"
@@ -152,7 +152,7 @@ module Rabbit
     end
 
     class Place
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": place\n   #{text}"
@@ -164,7 +164,7 @@ module Rabbit
     end
 
     class When
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": when\n   #{text}"
@@ -176,7 +176,7 @@ module Rabbit
     end
 
     class Where
-      include TextContainerElement
+      include TextBlockElement
 
       def to_rd
         ": where\n   #{text}"