rabbit 0.6.4 → 0.9.0

data/lib/rabbit/parser/ext/aafigure.rb

@@ -0,0 +1,31 @@
+module Rabbit
+  module Parser
+    module Ext
+      module AAFigure
+        module_function
+        AVAILABLE_OPTIONS = ["linewidth", "foreground", "fill", "background",
+                             "option"]
+        def make_image_by_aafigure(path, prop, logger)
+          image_file = Tempfile.new("rabbit-image-aafigure")
+          command = ["aafigure",
+                     "--type", "svg",
+                     "--encoding", "utf-8",
+                     "--output", image_file.path]
+          aafigure_options = []
+          AVAILABLE_OPTIONS.each do |name|
+            command.concat(["--#{name}", prop[name]]) if prop.has_key?(name)
+          end
+          command << path
+          if SystemRunner.run(*command)
+            image_file
+          else
+            format = _("tried aafigure command: %s")
+            additional_info = format % command.inspect
+            raise AAFigureCanNotHandleError.new(command.join(' '),
+                                                additional_info)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rabbit/parser/rd.rb

@@ -14,7 +14,8 @@ module Rabbit
       end
 
       def parse
-        source = "=begin\n#{@source.read}\n=end\n"
+        source = @source.read.gsub(/\r\n/, "\n")
+        source = "=begin\n#{source}\n=end\n"
         tree = ::RD::RDTree.new(source)
         visitor = RD2RabbitVisitor.new(@canvas)
         visitor.visit(tree)

data/lib/rabbit/parser/rd/ext/aafigure.rb

@@ -0,0 +1,18 @@
+require 'rabbit/parser/ext/aafigure'
+
+module Rabbit
+  module Parser
+    class RD
+      module Ext
+        module AAFigure
+          def make_image_by_aafigure(source, visitor)
+            make_image_from_file(source, visitor) do |src_file_path, prop|
+              Parser::Ext::AAFigure.make_image_by_aafigure(src_file_path, prop,
+                                                           visitor)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rabbit/parser/rd/ext/block-verbatim.rb

@@ -10,6 +10,7 @@ require 'rabbit/parser/rd/ext/base'
 require 'rabbit/parser/rd/ext/image'
 require 'rabbit/parser/rd/ext/enscript'
 require 'rabbit/parser/rd/ext/tex'
+require 'rabbit/parser/rd/ext/aafigure'
 require 'rabbit/parser/rd/ext/anthy'
 
 module Rabbit
@@ -20,6 +21,7 @@ module Rabbit
           include Image
           include Enscript
           include TeX
+          include AAFigure
           include Anthy
           include GetText
 
@@ -38,7 +40,26 @@ module Rabbit
             return nil unless /^(?:image|img)$/i =~ label
             src, prop = parse_source(source)
             return nil if prop['src'].nil?
-            make_image(visitor, prop['src'], prop)
+
+            if prop['align'] == "right"
+              body = visitor.current_body
+              if body["background-image"]
+                raise ParseError,
+                      _("multiple 'align = right' isn't supported.")
+              end
+              prop.each do |name, value|
+                name = name.gsub(/_/, '-')
+                if name == "src"
+                  property_name = "background-image"
+                else
+                  property_name = "background-image-#{name}"
+                end
+                body[property_name] = value
+              end
+              :no_element
+            else
+              make_image(visitor, prop['src'], prop)
+            end
           end
 
           def ext_block_verb_enscript(label, source, content, visitor)
@@ -62,6 +83,11 @@ module Rabbit
             make_image_by_mimeTeX(source, visitor)
           end
 
+          def ext_block_verb_aafigure(label, source, content, visitor)
+            return nil unless /^aafigure$/i =~ label
+            make_image_by_aafigure(source, visitor)
+          end
+
           def ext_block_verb_rt(label, source, content, visitor)
             return nil unless /^rt$/i =~ label
             unless defined?(RT2RabbitVisitor)

data/lib/rabbit/parser/rd/ext/inline-verbatim.rb

@@ -16,7 +16,16 @@ module Rabbit
           Inline = Parser::Ext::Inline
 
           def default_ext_inline_verbatim(label, source, content, visitor)
-            Verbatim.new(Text.new(source))
+            Text.new(source)
+          end
+
+          def apply_inline_verbatim(visitor, text)
+            visitor.apply_to_Verb(::RD::Verb.new(text))
+          end
+
+          def apply_inline_markup(visitor, text)
+            tree = ::RD::RDTree.new("=begin\n#{text}\n=end\n")
+            TextContainer.new(tree.root.children[0].accept(visitor).elements)
           end
 
 #           def ext_inline_verb_img(label, content, visitor)
@@ -32,49 +41,34 @@ module Rabbit
           def ext_inline_verb_del(label, source, content, visitor)
             label = label.to_s
             return nil unless /^del:(.*)$/ =~ label
-            DeletedText.new(Text.new(visitor.apply_to_String($1)))
+            DeletedText.new(apply_inline_markup(visitor, $1))
           end
 
           def ext_inline_verb_sub(label, source, content, visitor)
             label = label.to_s
             return nil unless /^sub:(.*)$/ =~ label
-            sub_text = $1
-            if /\A\s*\z/ =~ sub_text
-              sub_text = Text.new(sub_text)
-            else
-              sub_text = visitor.apply_to_Verb(::RD::Verb.new(sub_text))
-            end
+            sub_text = apply_inline_markup(visitor, $1)
             Inline.sub(sub_text)
           end
 
           def ext_inline_verb_sup(label, source, content, visitor)
             label = label.to_s
             return nil unless /^sup:(.*)$/ =~ label
-            sup_text = $1
-            if /\A\s*\z/ =~ sup_text
-              sup_text = Text.new(sup_text)
-            else
-              sup_text = visitor.apply_to_Verb(::RD::Verb.new(sup_text))
-            end
+            sup_text = apply_inline_markup(visitor, $1)
             Inline.sup(sup_text)
           end
 
           def ext_inline_verb_note(label, source, content, visitor)
             label = label.to_s
             return nil unless /^note:(.*)$/ =~ label
-            target = $1
-            if /^\w+:/ =~ target
-              target = visitor.apply_to_Verb(::RD::Verb.new(target))
-            else
-              target = Text.new(visitor.apply_to_String(target))
-            end
+            target = apply_inline_markup(visitor, $1)
             Inline.note(target)
           end
 
           def ext_inline_verb_lang(label, source, content, visitor)
             label = label.to_s
             return nil unless /^lang:([a-z]{2,2}):(.*)$/ =~ label
-            Inline.lang($1, Text.new(visitor.apply_to_String($2)))
+            Inline.lang($1, apply_inline_markup(visitor, $2))
           end
 
           def ext_inline_verb_wait(label, source, content, visitor)
@@ -89,7 +83,7 @@ module Rabbit
             name = $1
             content = $2
             if content
-              CustomTag.new(name, Text.new(visitor.apply_to_String(content)))
+              CustomTag.new(name, apply_inline_markup(visitor, content))
             else
               CustomTag.new(name)
             end

data/lib/rabbit/parser/rd/rd2rabbit-lib.rb

@@ -59,11 +59,12 @@ module Rabbit
           mode = :ignore
           contents.each do |content|
             case content
+            when :no_element
+              next
             when nil
               mode = :ignore
             when Slide
-              target = Body.new
-              content << target
+              target = content.body
               @canvas << content
               mode = :display
             when TitleSlide
@@ -95,6 +96,7 @@ module Rabbit
               @slide = TitleSlide.new(Title.new(title))
             else
               @slide = Slide.new(HeadLine.new(title))
+              @slide << Body.new
             end
             @foot_texts << []
             @slides << @slide
@@ -277,6 +279,10 @@ module Rabbit
           klass.new(content.collect{|x| x.text}.join(""))
         end
 
+        def current_body
+          @slide.body
+        end
+
         private
         def prepare_footnotes(tree)
           @footnotes = tree.find_all{|i| i.is_a? ::RD::Footnote}

data/lib/rabbit/parser/rd/rt/rt2rabbit-lib.rb

@@ -36,7 +36,13 @@ module Rabbit
       targets.each do |r|
         row = Element::TableRow.new
         each_cell(r) do |c|
-          cell = cell_class.new(c.value)
+          tree = ::RD::RDTree.new("=begin\n#{c.value}\n=end\n")
+          if tree.root.children.empty?
+            elements = []
+          else
+            elements = tree.root.children[0].accept(@rd_visitor).elements
+          end
+          cell = cell_class.new(elements)
           setup_text_align(cell, c.align)
           row << cell
         end

data/lib/rabbit/parser/wiki/output.rb

@@ -5,6 +5,7 @@ require 'rabbit/parser/ext/inline'
 require 'rabbit/parser/ext/image'
 require 'rabbit/parser/ext/enscript'
 require 'rabbit/parser/ext/tex'
+require 'rabbit/parser/ext/aafigure'
 require 'rabbit/parser/ext/anthy'
 require 'rabbit/parser/ext/entity'
 
@@ -47,6 +48,9 @@ module Rabbit
           []
         end
 
+        def current_body
+          @slides.last.body
+        end
 
         #
         # Procedures
@@ -223,8 +227,7 @@ module Rabbit
 
           @have_table_header = true
           @table_head << @parent if @parent.parent.nil?
-          content = item.collect {|e| e.markuped_text}.join
-          header = TableHeader.new(content)
+          header = TableHeader.new(item)
           def header.default_align
             Pango::Layout::ALIGN_CENTER
           end
@@ -236,8 +239,7 @@ module Rabbit
 
           @have_table_body = true
           @table_body << @parent if @parent.parent.nil?
-          content = item.collect {|e| e.markuped_text}.join
-          @parent << TableCell.new(content)
+          @parent << TableCell.new(item)
         end
 
         def blockquote_open
@@ -288,7 +290,9 @@ module Rabbit
         def block_plugin(src)
           return unless @parent
 
-          @parent << (evaluate_block_plugin(src) || text("{{#{src}}}"))
+          result = evaluate_block_plugin(src)
+          return if result == :no_element
+          @parent << (result || text("{{#{src}}}"))
         end
 
 
@@ -404,6 +408,7 @@ module Rabbit
         end
 
         class BlockPlugin
+          include GetText
           include Element
 
           def initialize(output)
@@ -411,7 +416,23 @@ module Rabbit
           end
 
           def image(source, props={})
-            Ext::Image.make_image(@output.canvas, source, props)
+            if props[:align].to_s == "right"
+              body = @output.current_body
+              if body["background-image"]
+                raise ParseError,
+                      _("multiple {{image, 'XXX.png', :align => :right}} " + \
+                        "isn't supported.")
+              end
+              body["background-image"] = source
+              props.each do |name, value|
+                name = name.to_s.gsub(/_/, '-')
+                value = value.to_s if name == "align"
+                body["background-image-#{name}"] = value
+              end
+              :no_element
+            else
+              Ext::Image.make_image(@output.canvas, source, props)
+            end
           end
           alias_method :img, :image
 
@@ -453,6 +474,14 @@ module Rabbit
             end
           end
           alias_method :mimetex, :mimeTeX
+
+          def aafigure(source, props={})
+            args = [@output.canvas, source]
+            Ext::Image.make_image_from_file(*args) do |src_file_path|
+              args = [src_file_path, props, @output.canvas]
+              [Ext::AAFigure.make_image_by_aafigure(*args), props]
+            end
+          end
         end
       end
     end

data/lib/rabbit/rabbit.rb

@@ -8,7 +8,7 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "0.6.4"
+  VERSION = "0.9.0"
 
   TMP_DIR_NAME = ".tmp"
 
@@ -84,6 +84,12 @@ module Rabbit
     end
   end
 
+  class AAFigureCanNotHandleError < ImageLoadWithExternalCommandError
+    def initialize(command, additional_info=nil)
+      super("aafigure", command, additional_info)
+    end
+  end
+
   class UnknownPropertyError < Error
     attr_reader :name
     def initialize(name)

data/lib/rabbit/renderer/display/clutter-embed.rb

@@ -195,9 +195,11 @@ module Rabbit
           add_widget_to_window(@window)
           widget.show
           attach_menu(@window)
+          attach_key(@window)
         end
 
         def detach
+          detach_key(@window)
           detach_menu(@window)
           widget.hide
           unless @window.destroyed?

data/lib/rabbit/renderer/display/comment-drawing-area.rb

@@ -36,6 +36,8 @@ module Rabbit
 
         def_delegators(:@pixmap, :x_dpi, :y_dpi)
 
+        def_delegators(:@pixmap, :set_font_resolution)
+
         attr_accessor :direction
 
         def width

data/lib/rabbit/renderer/print/base.rb

@@ -51,7 +51,7 @@ module Rabbit
         end
 
         def filename
-          @filename ||= "#{GLib.filename_from_utf8(@canvas.title)}.pdf"
+          @filename ||= default_filename
         end
 
         def draw_slide(slide, simulation)
@@ -67,6 +67,11 @@ module Rabbit
             end
           end
         end
+
+        private
+        def default_filename
+          "#{GLib.filename_from_utf8(@canvas.title.gsub(/\n/, ''))}.pdf"
+        end
       end
     end
   end

data/lib/rabbit/theme/applier.rb

@@ -126,7 +126,7 @@ module Rabbit
 
         draw_order = Proc.new do |item, canvas, x, y, w, h, tw, th, layout|
           first_text = item.elements.first
-          text_height = first_text.original_height
+          text_height = first_text.first_line_height
           text_height += first_text.padding_top + first_text.padding_bottom
           adjust_y = ((text_height / 2.0) - (th / 2.0)).ceil
 

data/lib/rabbit/theme/background-image-toolkit/background-image-toolkit.rb

@@ -0,0 +1,85 @@
+def apply_background_image_property(element, options={})
+  proc_name = options[:proc_name] || "background-image"
+  compute_initial_geometry = options[:compute_initial_geometry]
+
+  element.delete_pre_draw_proc_by_name(proc_name)
+
+  if options.has_key?(:file_name)
+    background_image = options[:file_name]
+  else
+    background_image = element["background-image"]
+    background_image = canvas.full_path(background_image) if background_image
+  end
+  return if background_image.nil?
+
+  if options.has_key?(:properties)
+    properties = options[:properties]
+  else
+    properties = {}
+    element.user_property.each do |name, value|
+      if /\Abackground-image-/ =~ name
+        properties[$POSTMATCH.gsub(/-/, '_')] = value
+      end
+    end
+  end
+
+  image = Image.new(background_image, properties)
+  align = properties["align"] || "center"
+  vertical_align = properties["vertical_align"] || "middle"
+  assign_box = properties["assign_box"]
+  element_margin_right = 0
+  case align
+  when "center"
+    image.horizontal_centering = true
+  end
+  case vertical_align
+  when "middle"
+    image.vertical_centering = true
+  end
+
+  element.add_pre_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|
+    if simulation
+      if compute_initial_geometry
+        _x, _y, _w, _h = compute_initial_geometry.call(canvas, x, y, w, h)
+      else
+        _x, _y, _w, _h = x, y, w, h
+      end
+
+      old_geometry = [_x, _y, _w, _h]
+      image.compile(canvas, _x, _y, _w, _h)
+      if image.do_vertical_centering?
+        adjust_height = ((_h - image.height - image.padding_bottom) / 2.0).ceil
+        if _y + adjust_height > 0
+          _y += adjust_height
+          _h -= adjust_height
+        end
+      end
+
+      case align
+      when "right"
+        if assign_box
+          element_margin_right = image.width +
+            image.margin_left + image.margin_right +
+            element.margin_right + element.padding_right
+          element_margin_right += element.parent.margin_right if element.parent
+        end
+        _x = _w - image.width - image.margin_right
+      when "center"
+      end
+
+      if old_geometry != [_x, _y, _w, _h]
+        image.compile(canvas, _x, _y, _w, _h)
+      end
+
+      if image.do_horizontal_centering?
+        image.do_horizontal_centering(canvas, _x, _y, _w, _h)
+      end
+    end
+    image.draw(simulation)
+    [x, y, w - element_margin_right, h]
+  end
+
+  element.add_post_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|
+    [x, y, w + element_margin_right, h]
+  end
+end