rabbit 2.2.1 → 3.0.0

data/lib/rabbit/command/rabbit-slide.ui

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkDialog" id="dialog">
+    <property name="can_focus">False</property>
+    <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancel-button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="apply-button">
+                <property name="label">gtk-apply</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkFrame">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkGrid">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="label" translatable="yes">ID:</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="slide-id">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="placeholder_text" translatable="yes">rubykaigi2012</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="label" translatable="yes">Base name:</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="slide-base-name">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="placeholder_text" translatable="yes">rabbit-introduction</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Markup language:</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="slide-markup-language">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Slide information</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancel-button</action-widget>
+      <action-widget response="-10">apply-button</action-widget>
+    </action-widgets>
+  </object>
+</interface>

data/lib/rabbit/command/rabbit.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2019  Sutou Kouhei <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -142,7 +142,6 @@ module Rabbit
           options.migemo_dictionary_name = "migemo-dict"
           options.use_gl = false
           options.show_native_window_id = false
-          options.keep_above = false
           options.source_filename = nil
 
 
@@ -587,14 +586,6 @@ module Rabbit
             options.use_gl = bool
           end
 
-          parser.category _("Display")
-
-          parser.on("--[no-]keep-above",
-                    _("Specify whether to keep above window."),
-                    "(#{options.keep_above})") do |bool|
-            options.keep_above = bool
-          end
-
           parser.category _("Others")
 
           parser.on("--check-syntax",
@@ -727,9 +718,9 @@ module Rabbit
         target.draw_scaled_image = @options.draw_scaled_image
       end
 
-      def setup_size(target)
-        target.width = @options.width
-        target.height = @options.height
+      def setup_base_size(target)
+        target.base_width = @options.width
+        target.base_height = @options.height
       end
 
       def setup_paper_size(target)
@@ -811,8 +802,8 @@ module Rabbit
 
       def do_print
         source = make_source
-        renderer = Renderer.printable_renderer(@options.slides_per_page)
-        canvas = make_canvas(renderer)
+        canvas = make_canvas(Renderer::Printer)
+        setup_base_size(canvas)
         setup_paper_size(canvas)
         setup_print_info(canvas)
         setup_3d_info(canvas)
@@ -829,7 +820,7 @@ module Rabbit
       def do_save_as_image
         source = make_source
         canvas = make_canvas(Renderer::Offscreen)
-        setup_size(canvas)
+        setup_base_size(canvas)
         setup_image_info(canvas)
         setup_print_info(canvas)
         setup_paper_size(canvas)
@@ -851,10 +842,14 @@ module Rabbit
         Renderer::Display.init(display_init_options)
 
         source = make_source
-        canvas = make_canvas(Renderer::Display)
+        if ENV["RABBIT_RENDERER"] == "screen"
+          canvas = make_canvas(Renderer::Screen)
+        else
+          canvas = make_canvas(Renderer::Display)
+        end
         frame = Frame.new(@logger, canvas)
         frame.geometry = @options.geometry
-        frame.force_keep_above = @options.keep_above
+        setup_base_size(canvas)
         setup_paper_size(canvas)
         setup_image_info(canvas)
         setup_print_info(canvas)
@@ -881,8 +876,7 @@ module Rabbit
 
       def do_check_syntax
         source = make_source
-        renderer = Renderer.printable_renderer(1)
-        canvas = make_canvas(renderer)
+        canvas = make_canvas(Renderer::Printer)
         exception = nil
         begin
           canvas.parse(source) do |_exception|

data/lib/rabbit/console.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2005-2017  Kouhei Sutou <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@ require 'English'
 
 require "shellwords"
 require "optparse"
+require "optparse/date"
+require "optparse/time"
 require "ostruct"
 require "uri"
 require "pathname"
@@ -79,8 +81,12 @@ module Rabbit
         options.after_hooks.each do |hook|
           hook.call(self, parser, options)
         end
-      rescue
-        @logger.fatal($!.message)
+      rescue => error
+        @logger.error("#{error.class}: #{error.message}")
+        error.backtrace.each do |line|
+          @logger.error(line)
+        end
+        raise
       end
 
       [options, options.logger]

data/lib/rabbit/dependency-canvas.rb

@@ -1,4 +1,20 @@
-require 'rabbit/canvas'
+# Copyright (C) 2006-2019  Sutou Kouhei <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require "rabbit/canvas"
 
 module Rabbit
   class DependencyCanvas < Canvas
@@ -10,6 +26,8 @@ module Rabbit
     def initialize(parent, *rest, &block)
       @parent = parent
       super(*rest, &block)
+      self.base_width = @parent.base_width
+      self.base_height = @parent.base_height
     end
   end
 end

data/lib/rabbit/element.rb

@@ -1,8 +1,35 @@
-require 'rabbit/utils'
+# Copyright (C) 2017  Kouhei Sutou <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-module Rabbit
-  module Element
-    dir = ::File.join("rabbit", "element")
-    Utils.require_files_under_directory_in_load_path(dir)
-  end
-end
+require "rabbit/element/block"
+require "rabbit/element/description-list"
+require "rabbit/element/enum-list"
+require "rabbit/element/footnote"
+require "rabbit/element/image-title-slide"
+require "rabbit/element/image"
+require "rabbit/element/index-slide"
+require "rabbit/element/item-list"
+require "rabbit/element/method-list"
+require "rabbit/element/poppler-slide"
+require "rabbit/element/poppler-title-slide"
+require "rabbit/element/preformatted"
+require "rabbit/element/slide"
+require "rabbit/element/syntax-highlighting"
+require "rabbit/element/table"
+require "rabbit/element/tag"
+require "rabbit/element/text"
+require "rabbit/element/title-slide"
+require "rabbit/element/video"

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

@@ -24,8 +24,7 @@ module Rabbit
       end
 
       def text
-        rectangle = Poppler::Rectangle.new(0, 0, @width, @height)
-        @page.get_text(rectangle)
+        @page.text
       end
 
       def clear_theme

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

@@ -107,7 +107,7 @@ module Rabbit
         super(my_font_size)
       end
 
-      private
+      protected
       # TODO: This is too workaround. :<
       def draw_sub_elements(canvas, x, y, w, h)
         draw_sub_elements_recursive(canvas, x, y, w, h, 0) do
@@ -122,7 +122,7 @@ module Rabbit
         else
           draw_sub_elements_recursive(canvas, x, y, w, h, i + 1) do
             element = @elements[i]
-            if element.respond_to?(:draw_sub_elements)
+            if element.is_a?(TextContainerElement)
               element.draw_sub_elements(canvas, x, y, w, h) do
                 yield
               end

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

@@ -206,13 +206,13 @@ module Rabbit
       end
 
       def setup_layout(layout, w)
-        if @wrap_mode
-          layout.set_width(w * Pango::SCALE)
-          layout.set_wrap(@wrap_mode)
+        layout.set_wrap(@wrap_mode) if @wrap_mode
+        layout.set_alignment(@align)
+        if @wrap_mode or layout.alignment != Pango::Alignment::LEFT
+          layout.set_width((w * Pango::SCALE).ceil)
         else
           layout.set_width(-1)
         end
-        layout.set_alignment(@align)
         indent = @indent
         indent = indent.value if indent.respond_to?(:value)
         layout.set_indent(indent)
@@ -325,6 +325,7 @@ module Rabbit
             break if new_size == size
             set_computed_font_size(new_size)
             compile(canvas, x, y, w, h)
+            break if !@wrap_mode and @layout.wrapped?
             break if compare.call(*@layout.pixel_size)
             size = new_size
           end

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

@@ -39,6 +39,14 @@ module Rabbit
         self["allotted-time"]
       end
 
+      def start_time
+        self["start-time"]
+      end
+
+      def end_time
+        self["end-time"]
+      end
+
       def to_html(generator)
         "<div class=\"title-slide\">\n#{super}\n</div>"
       end

data/lib/rabbit/element/video.rb

@@ -77,8 +77,7 @@ module Rabbit
         unless simulation
           if canvas.display?
             require "rabbit/video-window"
-            @video_window ||= VideoWindow.new(self)
-            @video_window.show(canvas.window)
+            VideoWindow.show(canvas.window, self)
           else
             draw_layout(canvas, x, y)
           end