rabbit 0.9.3 → 1.0.0

data/lib/rabbit/parser/rd.rb

@@ -5,7 +5,15 @@ require "rabbit/parser/base"
 module Rabbit
   module Parser
     class RD < Base
+    end
+  end
+end
+
+require "rabbit/parser/rd/rd2rabbit-lib"
 
+module Rabbit
+  module Parser
+    class RD
       push_loader(self)
       class << self
         def match?(source)
@@ -53,5 +61,3 @@ module Rabbit
     end
   end
 end
-
-require "rabbit/parser/rd/rd2rabbit-lib"

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

@@ -8,10 +8,12 @@ rescue LoadError
 end
 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'
+require 'rabbit/parser/ext/enscript'
+require 'rabbit/parser/ext/tex'
+require 'rabbit/parser/ext/aafigure'
+require 'rabbit/parser/ext/blockdiag'
+require 'rabbit/parser/ext/coderay'
+require 'rabbit/parser/ext/emacs'
 
 module Rabbit
   module Parser
@@ -19,10 +21,6 @@ module Rabbit
       module Ext
         class BlockVerbatim < Base
           include Image
-          include Enscript
-          include TeX
-          include AAFigure
-          include Anthy
           include GetText
 
           def default_ext_block_verbatim(label, source, content, visitor)
@@ -65,27 +63,66 @@ module Rabbit
           def ext_block_verb_enscript(label, source, content, visitor)
             return nil unless /^enscript (\w+)$/i =~ label
             lang = $1.downcase.untaint
-            enscript_block(label, lang, source, content, visitor)
-          end
 
-          def ext_block_verb_anthy(label, source, content, visitor)
-            return nil unless /^anthy$/i =~ label
-            anthy_hiragana_to_kanji(label, source, content, visitor)
+            src, prop = parse_source(source)
+            logger = visitor.logger
+
+            result = nil
+            if Parser::Ext::Enscript.check_availability(lang, logger)
+              result = Parser::Ext::Enscript.highlight(lang, src, logger)
+            end
+            result || default_ext_block_verbatim(label, src, src, visitor)
           end
 
           def ext_block_verb_LaTeX(label, source, content, visitor)
             return nil unless /^LaTeX$/i =~ label
-            make_image_by_LaTeX(source, visitor)
+            make_image_from_file(source, visitor) do |src_file_path, prop|
+              Parser::Ext::TeX.make_image_by_LaTeX(src_file_path, prop, visitor)
+            end
           end
 
           def ext_block_verb_mimeTeX(label, source, content, visitor)
             return nil unless /^mimeTeX$/i =~ label
-            make_image_by_mimeTeX(source, visitor)
+            make_image_from_file(source, visitor) do |src_file_path, prop|
+              Parser::Ext::TeX.make_image_by_mimeTeX(src_file_path, prop,
+                                                     visitor)
+            end
           end
 
           def ext_block_verb_aafigure(label, source, content, visitor)
             return nil unless /^aafigure$/i =~ label
-            make_image_by_aafigure(source, visitor)
+            make_image_from_file(source, visitor) do |src_file_path, prop|
+              Parser::Ext::AAFigure.make_image(src_file_path, prop, visitor)
+            end
+          end
+
+          def ext_block_verb_blockdiag(label, source, content, visitor)
+            return nil unless /^blockdiag$/i =~ label
+            make_image_from_file(source, visitor) do |src_file_path, prop|
+              Parser::Ext::BlockDiag.make_image(src_file_path, prop, visitor)
+            end
+          end
+
+          def ext_block_verb_coderay(label, source, content, visitor)
+            return nil unless /^coderay (\w+)$/i =~ label
+            lang = $1.downcase.untaint
+
+            src, prop = parse_source(source)
+            logger = visitor.logger
+
+            result = Parser::Ext::CodeRay.highlight(lang, src, logger)
+            result || default_ext_block_verbatim(label, src, src, visitor)
+          end
+
+          def ext_block_verb_emacs(label, source, content, visitor)
+            return nil unless /^emacs(?:\s+(.+))?$/i =~ label
+            mode_line = $1.untaint
+
+            src, prop = parse_source(source)
+            logger = visitor.logger
+
+            result = Parser::Ext::Emacs.highlight(src, logger, mode_line)
+            result || default_ext_block_verbatim(label, src, src, visitor)
           end
 
           def ext_block_verb_rt(label, source, content, visitor)

data/lib/rabbit/parser/wiki.rb

@@ -13,7 +13,9 @@ module Rabbit
       unshift_loader(self)
       class << self
         def match?(source)
-          /^!/.match(source.read[0, 500])
+          head = source.read[0, 500]
+          head.force_encoding("ASCII-8BIT") if head.respond_to?(:force_encoding)
+          /^!/.match(head)
         end
       end
 

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

@@ -6,7 +6,9 @@ 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/blockdiag'
+require 'rabbit/parser/ext/coderay'
+require 'rabbit/parser/ext/emacs'
 require 'rabbit/parser/ext/entity'
 
 module Rabbit
@@ -262,8 +264,8 @@ module Rabbit
           lang = info ? info.downcase : nil
           result = nil
 
-          if lang and Ext::Enscript.check_availability(lang, @canvas.logger)
-            result = Ext::Enscript.highlight(lang, contents, @canvas.logger)
+          if lang
+            result = Ext::CodeRay.highlight(lang, contents, @canvas.logger)
           end
 
           if result
@@ -453,21 +455,10 @@ module Rabbit
             end
           end
 
-          def anthy(source)
-            unless Ext::Anthy.available?
-              @output.canvas.logger.warn(_("Anthy isn't available"))
-              return nil
-            end
-
-            converted_source = Ext::Anthy.hiragana_to_kanji(source)
-            converted_source =
-              Ext::Escape.escape_meta_character(converted_source)
-            Paragraph.new(Text.new(converted_source))
-          end
-
           def LaTeX(source, props={})
             args = [@output.canvas, source]
             Ext::Image.make_image_from_file(*args) do |src_file_path|
+              props = Utils.stringify_hash_key(props)
               args = [src_file_path, props, @output.canvas]
               [Ext::TeX.make_image_by_LaTeX(*args), props]
             end
@@ -477,6 +468,7 @@ module Rabbit
           def mimeTeX(source, props={})
             args = [@output.canvas, source]
             Ext::Image.make_image_from_file(*args) do |src_file_path|
+              props = Utils.stringify_hash_key(props)
               args = [src_file_path, props, @output.canvas]
               [Ext::TeX.make_image_by_mimeTeX(*args), props]
             end
@@ -486,11 +478,31 @@ module Rabbit
           def aafigure(source, props={})
             args = [@output.canvas, source]
             Ext::Image.make_image_from_file(*args) do |src_file_path|
+              props = Utils.stringify_hash_key(props)
+              args = [src_file_path, props, @output.canvas]
+              [Ext::AAFigure.make_image(*args), props]
+            end
+          end
+
+          def blockdiag(source, props={})
+            args = [@output.canvas, source]
+            Ext::Image.make_image_from_file(*args) do |src_file_path|
+              props = Utils.stringify_hash_key(props)
               args = [src_file_path, props, @output.canvas]
-              [Ext::AAFigure.make_image_by_aafigure(*args), props]
+              [Ext::BlockDiag.make_image(*args), props]
             end
           end
 
+          def coderay(lang, source)
+            logger = @output.canvas.logger
+            Ext::CodeRay.highlight(lang, source, logger)
+          end
+
+          def emacs(source, mode_line=nil)
+            logger = @output.canvas.logger
+            Ext::Emacs.highlight(source, logger, mode_line)
+          end
+
           def tag(name, value=nil)
             if value
               CustomTag.new(name, @output.text(value))

data/lib/rabbit/rabbit.rb

@@ -8,7 +8,7 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "0.9.3"
+  VERSION = "1.0.0"
 
   TMP_DIR_NAME = ".tmp"
 
@@ -101,6 +101,12 @@ module Rabbit
     end
   end
 
+  class BlockDiagCanNotHandleError < ImageLoadWithExternalCommandError
+    def initialize(command, additional_info=nil)
+      super("blockdiag", command, additional_info)
+    end
+  end
+
   class UnknownPropertyError < Error
     attr_reader :name
     def initialize(name)

data/lib/rabbit/renderer/display.rb

@@ -7,7 +7,11 @@ module Rabbit
 
       class << self
         @initialized = false
-        def init
+        @preferred_class_name = nil
+        def init(options={})
+          if options.has_key?(:preferred_class_name)
+            @preferred_class_name = options[:preferred_class_name]
+          end
           unless @initialized
             @initialized = true
             dir = ::File.join("rabbit", "renderer", "display")
@@ -17,7 +21,15 @@ module Rabbit
 
         def new(*args, &block)
           init
-          corresponding_class_under_module(self).new(*args, &block)
+          target_class = nil
+          if @preferred_class_name
+            if const_defined?(@preferred_class_name)
+              target_class = const_get(@preferred_class_name)
+              target_class = nil unless target_class.is_a?(Class)
+            end
+          end
+          target_class ||= corresponding_class_under_module(self)
+          target_class.new(*args, &block)
         end
       end
     end

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

@@ -27,7 +27,7 @@ module Rabbit
       class ClutterEmbed
         class << self
           def priority
-            200
+            0
           end
         end
 

data/lib/rabbit/renderer/display/key-handler.rb

@@ -76,14 +76,14 @@ module Rabbit
             mod = mod.inject(no_mod) do |result, item|
               result | item
             end
-            keys = (0..9).collect{|i| Gdk::Keyval.const_get("GDK_#{i}")}
+            keys = (0..9).collect{|i| Gdk::Keyval.const_get("GDK_KEY_#{i}")}
             set_keys(keys, mod) do |group, obj, val, modifier|
-              index = calc_slide_number(val - Gdk::Keyval::GDK_0, modifier)
+              index = calc_slide_number(val - Gdk::Keyval::GDK_KEY_0, modifier)
               @canvas.activate("JumpTo") {index}
             end
-            keys = (0..9).collect{|i| Gdk::Keyval.const_get("GDK_KP_#{i}")}
+            keys = (0..9).collect{|i| Gdk::Keyval.const_get("GDK_KEY_KP_#{i}")}
             set_keys(keys, mod) do |group, obj, val, modifier|
-              index = calc_slide_number(val - Gdk::Keyval::GDK_KP_0, modifier)
+              index = calc_slide_number(val - Gdk::Keyval::GDK_KEY_KP_0, modifier)
               @canvas.activate("JumpTo") {index}
             end
           end
@@ -254,16 +254,16 @@ module Rabbit
 
         def set_key_press_event(widget)
           prev_keys = [
-            Gdk::Keyval::GDK_Up,
-            Gdk::Keyval::GDK_Left,
-            Gdk::Keyval::GDK_KP_Up,
-            Gdk::Keyval::GDK_KP_Left,
+            Gdk::Keyval::GDK_KEY_Up,
+            Gdk::Keyval::GDK_KEY_Left,
+            Gdk::Keyval::GDK_KEY_KP_Up,
+            Gdk::Keyval::GDK_KEY_KP_Left,
           ]
           next_keys = [
-            Gdk::Keyval::GDK_Right,
-            Gdk::Keyval::GDK_Down,
-            Gdk::Keyval::GDK_KP_Right,
-            Gdk::Keyval::GDK_KP_Down,
+            Gdk::Keyval::GDK_KEY_Right,
+            Gdk::Keyval::GDK_KEY_Down,
+            Gdk::Keyval::GDK_KEY_KP_Right,
+            Gdk::Keyval::GDK_KEY_KP_Down,
           ]
           widget.signal_connect("key_press_event") do |_widget, event|
             handled = true

data/lib/rabbit/soap/base.rb

@@ -1,6 +1,6 @@
 module Rabbit
   module SOAP
-    NS = "http://www.cozmixng.org/ns/rabbit/0.0.1/"
+    NS = "http://rabbit-shockers.org/ns/rabbit/0.0.1/"
 
     module_function
     def element_name(name)

data/lib/rabbit/theme-browser.rb

@@ -70,9 +70,9 @@ module Rabbit
       @window.signal_connect("key_press_event") do |widget, event|
         if event.state.control_mask?
           case event.keyval
-          when Gdk::Keyval::GDK_q
+          when Gdk::Keyval::GDK_KEY_q
             @window.destroy
-          when Gdk::Keyval::GDK_r
+          when Gdk::Keyval::GDK_KEY_r
             page.reload
           end
         end

data/lib/rabbit/theme/base/base.rb

@@ -1,3 +1,10 @@
+@foreground = "black"
+@background = "white"
+@shadow_color = "#fff9"
+
+set_foreground(@foreground)
+set_background(@background)
+
 @xx_large_font_size = screen_size(15 * Pango::SCALE)
 @x_large_font_size = screen_size(11 * Pango::SCALE)
 @large_font_size = screen_size(7 * Pango::SCALE)

data/lib/rabbit/theme/default-comment/default-comment.rb

@@ -0,0 +1,9 @@
+if canvas.comment_theme
+  include_theme(canvas.comment_theme)
+else
+  if display? and canvas.renderer.widget.class.name == "Clutter::GtkEmbed"
+    include_theme("clutter-comment")
+  else
+    include_theme("footer-comment")
+  end
+end

data/lib/rabbit/theme/default-comment/property.rb

@@ -0,0 +1,4 @@
+@category = N_("Toolkit")
+@title = N_("DefaultComment")
+@abstract = N_("Toolkit to set up default comment theme.")
+@description = N_("Sets up default comment theme.")

data/lib/rabbit/theme/default-item-mark-setup/default-item-mark-setup.rb

@@ -17,7 +17,7 @@ def setup_default_item_mark_type(type, item, canvas, x, y, w, h, color)
     canvas.draw_circle(true, x, y, w, h, color)
   when "check", "dash"
     props = {
-      "font_family" => @font_family,
+      "font-family" => @font_family,
       "weight" => "bold",
       "foreground" => canvas.make_color(color).to_gdk_format,
     }.merge(item.first.text_props)

data/lib/rabbit/theme/default-slide/default-slide.rb

@@ -44,9 +44,9 @@ match(Slide, HeadLine) do |headlines|
     slide = headline.slide
     headline.hide if slide.hide_title?
     color = slide["headline-color"]
-    headline.prop_set("foreground", color) if color
+    headline.font("color", color) if color
     shadow_color = slide["headline-shadow-color"]
-    headline["shadow-color"] = shadow_color if shadow_color
+    headline.font("shadow-color" => shadow_color) if shadow_color
   end
 end
 

data/lib/rabbit/theme/default-text/default-text.rb

@@ -77,6 +77,11 @@ match("**", PreformattedText) do |texts|
   set_font_family(texts, @monospace_font_family)
 end
 
+match("**", SyntaxHighlightingText) do |texts|
+  texts.prop_set("size", @normal_font_size)
+  set_font_family(texts, @monospace_font_family)
+end
+
 match("**", Keyword) do |texts|
   texts.prop_set("weight", "bold")
 end

data/lib/rabbit/theme/default/default.rb

@@ -1,5 +1,6 @@
-@default_foreground ||= "black"
-@default_background ||= "white"
+@default_foreground ||= @foreground
+@default_background ||= @background
+@default_shadow_color ||= @shadow_color
 
 set_foreground(@default_foreground)
 set_background(@default_background)
@@ -29,8 +30,6 @@ include_theme("body-background-image")
 
 include_theme("tag")
 
-if display? and canvas.renderer.widget.class.name == "Clutter::GtkEmbed"
-  include_theme("clutter-comment")
-else
-  include_theme("footer-comment")
-end
+include_theme("syntax-highlighting")
+
+include_theme("default-comment")

data/lib/rabbit/theme/footer-comment/footer-comment.rb

@@ -2,12 +2,21 @@ theme_exit unless display?
 
 proc_name = "footer-comment"
 
+@footer_comment_color ||= @foreground
+@footer_comment_shadow_color ||= @shadow_color
 @footer_comment_props ||= {
-  "size" => (@xx_small_font_size * 0.5).ceil,
+  "size" => (@x_small_font_size * 0.5).ceil,
   "font_family" => @font_family,
+  "color" => @footer_comment_color,
+  "shadow-color" => @footer_comment_shadow_color,
+}
+@footer_comment_padding ||= {
+  :left => 3 * @space,
+  :right => 3 * @space,
+  :bottom => (@space * 0.5).ceil,
 }
-@footer_comment_color ||= @default_foreground
 @footer_comment_min_display_time ||= 1
+@footer_comment_keep_last_comment ||= false
 
 match(SlideElement) do |slides|
   slides.delete_post_draw_proc_by_name(proc_name)
@@ -17,8 +26,13 @@ match(SlideElement) do |slides|
 
   comments = []
   canvas.on_comment(proc_name) do |comment|
+    if comments.empty?
+      GLib::Timeout.add_seconds(@footer_comment_min_display_time) do
+        canvas.activate("Redraw")
+        not comments.empty?
+      end
+    end
     comments << comment
-    canvas.activate("Redraw")
   end
 
   redraw_time = Time.now
@@ -29,16 +43,29 @@ match(SlideElement) do |slides|
         text = Text.new(ERB::Util.h(content.strip.gsub("\n", " ")))
         if Time.now - redraw_time > @footer_comment_min_display_time
           redraw_time = Time.now
-          comments.shift if comments.size > 1
+          if @footer_comment_keep_last_comment
+            comments.shift if comments.size > 1
+          else
+            comments.shift
+          end
         end
-        text.font @footer_comment_props
         set_font_family(text)
+        text.font @footer_comment_props
+        text.padding_with @footer_comment_padding
         text.compile(canvas, x, y, w, h)
-        text.layout.set_width(w * Pango::SCALE)
+
+        # set horizontal
         text_x = x
+        text_w = w - text.padding_left - text.padding_right
+        text.compile(canvas, text_x, y, text_w, h)
+
+        # set vertical
         text_y = canvas.height - slide.margin_bottom - slide.padding_bottom
-        text_y -= text.layout.pixel_size[1]
-        canvas.draw_layout(text.layout, text_x, text_y, @footer_comment_color)
+        text_y -= text.height
+        text_h = h - text.height
+        text.compile(canvas, text_x, text_y, text_w, text_h)
+
+        text.draw
       end
     end
     [x, y, w, h]