rabbit 1.0.4 → 1.0.5

data/lib/rabbit/gettext.rb

@@ -1,10 +1,7 @@
 begin
-  begin
-    require "gettext"
-  rescue LoadError
-    require "rubygems"
-    require "gettext"
-  end
+  require "rubygems"
+  raise LoadError if Gem.respond_to?(:_deprecated_all_load_paths)
+  require "gettext"
   module GetText
     if ::GetText::TextDomainManager.respond_to?(:textdomain)
       alias _gettext gettext

data/lib/rabbit/image/pdf.rb

@@ -69,7 +69,7 @@ module Rabbit
         w = original_width
         h = original_height
         pixbuf = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, w, h)
-        page.render_to_pixbuf(0, 0, w, h, 1.0, 0, pixbuf)
+        page.render(0, 0, w, h, 1.0, 0, pixbuf)
         pixbuf
       end
     end

data/lib/rabbit/info-window.rb

@@ -58,6 +58,7 @@ module Rabbit
     def moved(index)
       return unless showing?
       check_timer
+      update_note_text if on_note_mode?
       adjust_slide(index)
     end
 
@@ -95,7 +96,11 @@ module Rabbit
       end
       @window.title = _("%s: Information window") % @canvas.title
       @window.set_default_size(width, height) if width and height
-      init_widgets(width, height)
+      if on_note_mode?
+        init_widgets_on_note_mode(width, height)
+      else
+        init_widgets(width, height)
+      end
       init_menu
       attach_key(@window)
       attach_menu(@window)
@@ -136,6 +141,34 @@ module Rabbit
       @outer_box.show
     end
 
+    def init_widgets_on_note_mode(width, height)
+      init_timer_label(width * (1.0 / 5.0), height * (2.0 / 5.0))
+      init_note_text(width * (5.0 / 5.0), height * (3.0 / 5.0))
+      @outer_box = Gtk::VBox.new
+
+      current_box = Gtk::HBox.new
+      current_box.pack_start(@timer_label, false, false)
+      @previous_canvas.attach_to(nil, @window, current_box) do |container, widget|
+        widget.set_size_request(width * (1.0 / 5.0), height * (2.0 / 5.0))
+        container.pack_start(widget, true, true, 10)
+      end
+      @current_canvas.attach_to(nil, @window, current_box) do |container, widget|
+        widget.set_size_request(width * (2.0 / 5.0), height * (2.0 / 5.0))
+        container.pack_start(widget, true, true)
+      end
+      @next_canvas.attach_to(nil, @window, current_box) do |container, widget|
+        widget.set_size_request(width * (1.0 / 5.0), height * (2.0 / 5.0))
+        container.pack_end(widget, true, true, 10)
+      end
+      @outer_box.pack_start(current_box, false, false)
+
+      bottom_box = Gtk::HBox.new
+      bottom_box.pack_start(@note_label, false, true, 20)
+      @outer_box.pack_start(bottom_box, true, false)
+
+      @outer_box.show
+    end
+
     def init_canvas_widgets
       @canvas_widgets = Gtk::HBox.new
       @current_canvas.attach_to(nil, @window, @canvas_widgets)
@@ -150,6 +183,18 @@ module Rabbit
       check_timer
     end
 
+    def init_note_text(width, height)
+      @note_label = Gtk::Label.new
+      @note_label.justify = :left
+      @note_label.wrap = true
+      @note_label.markup = markupped_note_text(width, height)
+      @note_label.set_size_request(width, height)
+    end
+
+    def update_note_text
+      @note_label.markup = markupped_note_text
+    end
+
     def check_timer
       return if @timer_started
 
@@ -163,7 +208,8 @@ module Rabbit
       width ||= @window.size[0] * (1.0 / 3.0)
       height ||= @window.size[1] * (1.0 / 3.0)
       attrs = {}
-      attrs["font_desc"] = ((height * 200) / Pango::SCALE).to_s
+      font_size = on_note_mode? ? 100 : 200
+      attrs["font_desc"] = ((height * font_size) / Pango::SCALE).to_s
       rest_time = @canvas.rest_time
       attrs["foreground"] = "red" if rest_time and rest_time < 0
       "<span #{@canvas.to_attrs(attrs)}>#{h timer_label}</span>"
@@ -178,6 +224,18 @@ module Rabbit
       end
     end
 
+    def markupped_note_text(width=nil, height=nil)
+      height ||= @window.size[1] * (3.0 / 5.0)
+      if @canvas.current_slide["note"]
+        text = @canvas.current_slide["note"].gsub(/\\n/, "\n")
+      else
+        text = ""
+      end
+      attrs = {}
+      attrs["font_desc"] = ((height * 40) / Pango::SCALE).to_s
+      "<span #{@canvas.to_attrs(attrs)}>#{text}</span>"
+    end
+
     def update_source
       each do |canvas|
         source = Source::Memory.new("UTF-8", @canvas.logger)
@@ -205,5 +263,9 @@ module Rabbit
     def each(&block)
       [@previous_canvas, @current_canvas, @next_canvas].each(&block)
     end
+
+    def on_note_mode?
+      @canvas.slides.any? {|slide| slide["note"]}
+    end
   end
 end

data/lib/rabbit/logger/base.rb

@@ -64,10 +64,11 @@ module Rabbit
       def info(message_or_error=nil, &block)
         log(INFO, message_or_error, &block)
       end
-      
-      def warn(message_or_error=nil, &block)
+
+      def warning(message_or_error=nil, &block)
         log(WARNING, message_or_error, &block)
       end
+      alias_method :warn, :warning # for backward compatibility
 
       def error(message_or_error=nil, &block)
         log(ERROR, message_or_error, &block)

data/lib/rabbit/middleware/views/index.haml

@@ -1,12 +1,12 @@
 %ul
   %li
-    - if @rabbit.have_next_slide?
+    - if @rabbit.have_next?
       %a(href="/pages/next")
         .navi 次へ
     - else
       .navi 次へ
   %li
-    - if @rabbit.have_previous_slide?
+    - if @rabbit.have_previous?
       %a(href="/pages/previous")
         .navi 前へ
     - else

data/lib/rabbit/parser.rb

@@ -20,5 +20,31 @@ module Rabbit
     def normalize_property_name(name)
       name.gsub(/_/, "-").strip
     end
+
+    class SlidePropertySetter
+      def initialize(slide)
+        @slide = slide
+      end
+
+      def apply(element)
+        return unless element.is_a?(Element::DescriptionList)
+        element.each do |item|
+          name = Parser.normalize_property_name(item.term.text)
+          @slide[name] = item.content.text.strip
+        end
+      end
+    end
+
+    class NoteSetter
+      def initialize(slide)
+        @slide = slide
+      end
+
+      def apply(element)
+        return unless element.is_a?(Element::Paragraph)
+        @slide['note'] ||= ""
+        @slide['note'] << element.text
+      end
+    end
   end
 end

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

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 require 'rabbit/utils'
 require 'rabbit/parser/ext/escape'
 
@@ -12,6 +10,13 @@ module Rabbit
 
         module_function
         def highlight(text, logger, mode_line=nil)
+          begin
+            require 'nokogiri'
+          rescue
+            logger.warning("Syntax highlight by Emacs requires nokogiri.")
+            return nil
+          end
+
           src_file = Tempfile.new("rabbit-emacs")
           src_file.open
           src_file.print("#{mode_line}\n") if mode_line

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

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 require 'rabbit/utils'
 require 'rabbit/parser/ext/escape'
 
@@ -35,6 +33,13 @@ module Rabbit
         end
 
         def highlight(lang, text, logger)
+          begin
+            require 'nokogiri'
+          rescue
+            logger.warning("Syntax highlight by enscript requires nokogiri.")
+            return nil
+          end
+
           src_file = Tempfile.new("rabbit-enscript")
           src_file.open
           src_file.print(text)

data/lib/rabbit/parser/markdown.rb

@@ -0,0 +1,32 @@
+require "kramdown"
+
+require "rabbit/parser/base"
+
+module Rabbit
+  module Parser
+    class Markdown < Base
+    end
+  end
+end
+
+require "rabbit/parser/markdown/converter"
+
+module Rabbit
+  module Parser
+    class Markdown
+      unshift_loader(self)
+      class << self
+        def match?(source)
+          /\Amd\z/i =~ source.extension.to_s
+        end
+      end
+
+      include Element
+      def parse
+        document = Kramdown::Document.new(@source.read)
+        converter = Converter.new(@canvas)
+        converter.convert(document.root)
+      end
+    end
+  end
+end

data/lib/rabbit/parser/markdown/converter.rb

@@ -0,0 +1,257 @@
+module Rabbit
+  module Parser
+    class Markdown
+      class Converter
+        include Element
+
+        def initialize(canvas)
+          @canvas = canvas
+          @slides = []
+          @slide = nil
+          @slide_property_mode = false
+        end
+
+        def convert(element)
+          __send__("convert_#{element.type}", element)
+        end
+
+        private
+        def convert_container(element)
+          elements = []
+          element.children.each do |child|
+            element = convert(child)
+            case element
+            when nil, :no_element
+              # ignore
+            else
+              elements << element
+            end
+          end
+          elements
+        end
+
+        def convert_root(element)
+          target = nil
+          mode = :ignore
+          require 'pp'
+          convert_container(element).each do |content|
+            case content
+            when :no_element
+              next
+            when nil
+              mode = :ignore
+            when Slide
+              target = content.body
+              @canvas << content
+              mode = :display
+            when TitleSlide
+              target = content
+              @canvas << content
+              mode = :display
+            when SlidePropertySetter, NoteSetter
+              target = content
+              mode = :property
+            else
+              case mode
+              when :display
+                target << content
+              when :property
+                target.apply(content)
+              end
+            end
+          end
+        end
+
+        def convert_header(element)
+          slide, @slide = @slide, nil
+          contents = convert_container(element)
+          case element.options[:level]
+          when 1
+            if @slides.empty?
+              @slide = TitleSlide.new(Title.new(contents))
+            else
+              @slide = Slide.new(HeadLine.new(contents))
+              @slide << Body.new
+            end
+            @slides << @slide
+            @slide
+          when 2
+            if /\Anote\z/i =~ contents.first.text
+              NoteSetter.new(@slides.last)
+            else
+              SlidePropertySetter.new(@slides.last)
+            end
+          else
+            nil
+          end
+        end
+
+        def text(content)
+          Text.new(Parser::Ext::Escape.escape_meta_character(content))
+        end
+
+        def convert_text(element)
+          text(element.value)
+        end
+
+        def convert_blank(element)
+          :no_element
+        end
+
+        def convert_dl(element)
+          list = DescriptionList.new
+          term = nil
+          content = nil
+          convert_container(element).each do |item|
+            case item
+            when DescriptionTerm
+              list << DescriptionListItem.new(term, content) if term
+              term = item
+            when DescriptionContent
+              content = item
+            end
+          end
+          list << DescriptionListItem.new(term, content) if term
+          list
+        end
+
+        def convert_dt(element)
+          DescriptionTerm.new(Paragraph.new(convert_container(element)))
+        end
+
+        def convert_dd(element)
+          DescriptionContent.new(convert_container(element))
+        end
+
+        def convert_p(element)
+          if element.children.collect {|child| child.type} == [:img]
+            convert_container(element)[0]
+          else
+            if element.children.any? {|child| child.type == :img}
+              raise ParseError,
+                      _("multiple ![alt]{image} in a paragraph isn't supported.")
+            else
+              Paragraph.new(convert_container(element))
+            end
+          end
+        end
+
+        def convert_ul(element)
+          ItemList.new(convert_container(element))
+        end
+
+        def convert_li(element)
+          ItemListItem.new(convert_container(element))
+        end
+
+        def convert_smart_quote(element)
+          Text.new(Parser::Ext::Entity::TABLE[element.value.to_s])
+        end
+
+        def convert_typographic_sym(element)
+          Text.new(Parser::Ext::Entity::TABLE[element.value.to_s])
+        end
+
+        def convert_table(element)
+          table = Table.new
+          convert_container(element).each do |item|
+            table << item
+          end
+          table
+        end
+
+        def convert_thead(element)
+          in_table_header do
+            TableHead.new(convert_container(element))
+          end
+        end
+
+        def in_table_header
+          in_table_header, @in_table_header = @in_table_header, true
+          yield
+        ensure
+          @in_table_header = in_table_header
+        end
+
+        def convert_tbody(element)
+          TableBody.new(convert_container(element))
+        end
+
+        def convert_tr(element)
+          TableRow.new(convert_container(element))
+        end
+
+        def convert_td(element)
+          if @in_table_header
+            header = TableHeader.new(convert_container(element))
+            def header.default_align
+              Pango::Layout::ALIGN_CENTER
+            end
+            header
+          else
+            TableCell.new(convert_container(element))
+          end
+        end
+
+        def convert_comment(element)
+          :no_element
+        end
+
+        def convert_codeblock(element)
+          content = element.value.chomp
+          lang = element.attr["lang"]
+          if lang
+            highlighted = Ext::CodeRay.highlight(lang, content, @canvas.logger)
+            return highlighted if highlighted
+          end
+          PreformattedBlock.new(PreformattedText.new(text(content)))
+        end
+
+        def convert_blockquote(element)
+          BlockQuote.new(convert_container(element))
+        end
+
+        def convert_img(element)
+          options = element.attr.dup
+          uri = options.delete("src")
+          title = options.delete("title")
+          alt = options.delete("alt")
+          caption = title || alt
+          options["caption"] ||= caption if caption
+          if options["align"] == "right"
+            body = @slides.last.body
+            if body["background-image"]
+              raise ParseError,
+                    _("multiple ![]('XXX.png'){:align='right'} " + \
+                      "isn't supported.")
+            end
+            body["background-image"] = uri
+            options.each do |name, value|
+              name = name.to_s.gsub(/_/, '-')
+              body["background-image-#{name}"] = value
+            end
+            :no_element
+          else
+            image = Ext::Image.make_image(@canvas, uri, options)
+            image || text(alt || src)
+          end
+        end
+
+        def convert_em(element)
+          Emphasis.new(Emphasis.new(convert_container(element)))
+        end
+
+        def convert_strong(element)
+          Emphasis.new(Emphasis.new(convert_container(element)))
+        end
+
+        def convert_math(element)
+          args = [@canvas, element.value]
+          Ext::Image.make_image_from_file(*args) do |src_file_path|
+            [Ext::TeX.make_image_by_LaTeX(src_file_path, {}, @canvas), {}]
+          end
+        end
+      end
+    end
+  end
+end