rabbit 2.1.9 → 2.2.0

data/po/ja/rabbit.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Rabbit 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-05-27 13:29+0900\n"
+"PO-Revision-Date: 2016-11-19 10:38+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: Kouhei Sutou <kou@cozmixng.org> and Kobayashi Noritada <nori1@d"
 "olphin.c.u-tokyo.ac.jp>\n"
@@ -872,6 +872,9 @@ msgstr "gemをインストール中: %s"
 msgid "Installing gem in user install mode: %s"
 msgstr "gemをユーザーインストールモードでインストール中: %s"
 
+msgid "Enter password on RubyGems.org [%{user}]: "
+msgstr "RubyGems.orgのパスワードを入力してください [%{user}]: "
+
 msgid "Line width:"
 msgstr "線の太さ"
 
@@ -956,6 +959,9 @@ msgstr "水平線はサポートしていません"
 msgid "multiple ![]('XXX.png'){:align='right'} isn't supported."
 msgstr "複数の「![]('XXX.png'){:align='right'}」はサポートしていません。"
 
+msgid "tag name is missing."
+msgstr "タグ名がありません。"
+
 msgid "HTML isn't supported."
 msgstr "HTMLはサポートしていません"
 
@@ -1010,8 +1016,8 @@ msgstr "タイトルの編集に失敗しました: %s"
 msgid "Feailed to get slide URL: %s"
 msgstr "スライドURLの取得に失敗しました: %s"
 
-msgid "Enter password on SlideShare"
-msgstr "SlideShareのパスワードを入力してください"
+msgid "Enter password on SlideShare [%{user}]: "
+msgstr "SlideShareのパスワードを入力してください [%{user}]: "
 
 msgid "none (get from STDIN) or [FILE_NAMES]"
 msgstr ""
@@ -1424,10 +1430,10 @@ msgid ""
 msgstr "指定したキーワードを強調テキストとしてマークアップするemphasize_keywordメソッドを提供します。"
 
 msgid "Enishi Green"
-msgstr ""
+msgstr "えにしグリーン"
 
 msgid "EnishTech green based theme"
-msgstr ""
+msgstr "えにしテックの緑色をベースにしたテーマ"
 
 msgid "Etc"
 msgstr "その他"

data/rabbit.gemspec

@@ -43,9 +43,10 @@ Gem::Specification.new do |spec|
     spec.executables = Dir.glob("*")
   end
 
-  spec.required_ruby_version = ">= 1.9.3"
+  spec.required_ruby_version = ">= 2.1.0"
 
   spec.add_runtime_dependency("gio2")
+  spec.add_runtime_dependency("gdk_pixbuf2", ">= 3.0.9")
   spec.add_runtime_dependency("gtk2")
   spec.add_runtime_dependency("rsvg2")
   spec.add_runtime_dependency("poppler")

data/sample/rabbit.md

@@ -103,6 +103,16 @@ theme
 * テーマの再読み込み
 * テーマの切り替え
 
+# 機能: タグ
+
+{::tag name="x-large"}大きなテキスト{:/tag}
+
+{:.center}
+中央寄せされたテキスト
+
+{:.right}
+右寄せされたテキスト
+
 # ToDo
 
 * インラインでの画像表示

data/test/parser/test-markdown.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2016  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
@@ -359,5 +359,51 @@ a ![](#{image_path})
         end
       end
     end
+
+    class TagTest < self
+      include Rabbit::GetText
+
+      def test_no_name
+        message = _("tag name is missing.")
+        assert_raise(Rabbit::ParseError.new(message)) do
+          parse(<<-MARKDOWN)
+{::tag}content{:/tag}
+          MARKDOWN
+        end
+      end
+
+      def test_inline
+        assert_equal([
+                       "Body", [
+                         "Paragraph", [
+                           "CustomTag", [
+                             "Text",
+                             "Hello",
+                           ],
+                         ],
+                       ],
+                     ],
+                     parse(<<-MARKDOWN))
+{::tag name="x-large"}Hello{:/tag}
+        MARKDOWN
+      end
+
+      def test_paragraph
+        assert_equal([
+                       "Body", [
+                         "Paragraph", [
+                           "CustomTag", [
+                             "Text",
+                             "Hello",
+                           ],
+                         ],
+                       ],
+                     ],
+                     parse(<<-MARKDOWN))
+{:.x-large}
+Hello
+        MARKDOWN
+      end
+    end
   end
 end

data/test/source-generator/test-markdown.rb

@@ -39,10 +39,10 @@ class TestSourceGeneratorMarkdown < Test::Unit::TestCase
   def test_definition_list_item
     item = @generator.definition_list_item("Rabbit",
                                            "The presentation tool for Rubyist")
-    assert_equal(<<-EOM.rstrip, item)
+    assert_equal(<<-MARKDOWN, item)
 Rabbit
 :   The presentation tool for Rubyist
-EOM
+    MARKDOWN
   end
 
   def test_unordered_list_item

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gio2
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gdk_pixbuf2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: gtk2
   requirement: !ruby/object:Gem::Requirement
@@ -595,6 +609,7 @@ files:
 - lib/rabbit/front.rb
 - lib/rabbit/gem-builder.rb
 - lib/rabbit/gem-finder.rb
+- lib/rabbit/gem-pusher.rb
 - lib/rabbit/gesture/handler.rb
 - lib/rabbit/gesture/processor.rb
 - lib/rabbit/gettext.rb
@@ -650,6 +665,7 @@ files:
 - lib/rabbit/parser/rd/visitor.rb
 - lib/rabbit/parser/wiki.rb
 - lib/rabbit/parser/wiki/output.rb
+- lib/rabbit/password-reader.rb
 - lib/rabbit/path-manipulatable.rb
 - lib/rabbit/progress.rb
 - lib/rabbit/rabbit.rb
@@ -683,10 +699,7 @@ files:
 - lib/rabbit/renderer/engine/cairo.rb
 - lib/rabbit/renderer/gl.rb
 - lib/rabbit/renderer/kernel.rb
-- lib/rabbit/renderer/pixmap.rb
-- lib/rabbit/renderer/pixmap/base.rb
-- lib/rabbit/renderer/pixmap/cairo.rb
-- lib/rabbit/renderer/pixmap/gl.rb
+- lib/rabbit/renderer/offscreen.rb
 - lib/rabbit/renderer/print.rb
 - lib/rabbit/renderer/print/base.rb
 - lib/rabbit/renderer/print/cairo.rb
@@ -1082,7 +1095,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1090,7 +1103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rabbit
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rabbit is an RD-document-based presentation application.
@@ -1118,4 +1131,3 @@ test_files:
 - test/image/test-dia.rb
 - test/image/test-eps.rb
 - test/test-size.rb
-has_rdoc: 

data/lib/rabbit/renderer/pixmap.rb

@@ -1 +0,0 @@
-require "rabbit/renderer/pixmap/cairo"

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

@@ -1,127 +0,0 @@
-require "rabbit/rabbit"
-
-require "rabbit/renderer/base"
-require "rabbit/utils"
-
-module Rabbit
-  module Renderer
-    module Pixmap
-      module Base
-        include Renderer::Base
-
-        @@depth = nil
-
-        attr_accessor :width, :height, :pango_context
-
-        attr_accessor :filename
-
-        def initialize(canvas, width=nil, height=nil)
-          super(canvas)
-          @width = width
-          @height = height
-          @filename = nil
-          init_dummy_pixmap
-          init_color
-          @pango_context = nil
-        end
-
-        def post_apply_theme
-        end
-
-        def post_move(old_index, index)
-        end
-
-        def post_move_in_slide(old_index, index)
-        end
-
-        def pre_parse
-        end
-
-        def post_parse
-        end
-
-        def index_mode_on
-        end
-
-        def index_mode_off
-        end
-
-        def pre_toggle_index_mode
-        end
-
-        def post_toggle_index_mode
-        end
-
-        def make_layout(text)
-          attrs, text = Pango.parse_markup(text)
-          layout = Pango::Layout.new(@pango_context || create_pango_context)
-          layout.text = text
-          layout.set_attributes(attrs)
-          layout
-        end
-
-        def to_pixbuf(slide)
-          slide.draw(@canvas)
-          Utils.drawable_to_pixbuf(@pixmap)
-        end
-
-        def create_pango_context
-          context = Gtk::Invisible.new.create_pango_context
-          set_font_resolution(context)
-          context
-        end
-
-        def pre_to_pixbuf(slide_size)
-        end
-
-        def to_pixbufing(i)
-          Utils.process_pending_events
-          true
-        end
-
-        def post_to_pixbuf(canceled)
-        end
-
-        def draw_slide(slide, simulation)
-          init_pixmap(slide, simulation)
-          super
-        end
-
-        private
-        def init_color
-          super
-          init_engine_color
-        end
-
-        def depth
-          @@depth ||= ScreenInfo.screen_depth
-        end
-
-        def off_screen_renderer?
-          true
-        end
-
-        def init_dpi
-          @x_dpi = ScreenInfo.screen_x_resolution
-          @y_dpi = ScreenInfo.screen_y_resolution
-        end
-
-        def init_pixmap(slide, simulation)
-          if simulation
-            if @pixmap.nil? or @pixmap.size != [@width, @height]
-              @pixmap = Gdk::Pixmap.new(nil, @width, @height, depth)
-              init_gl_capability(@pixmap)
-            end
-            init_renderer(@pixmap)
-          end
-        end
-
-        def init_dummy_pixmap
-          @pixmap = Gdk::Pixmap.new(nil, 1, 1, depth)
-          init_gl_capability(@pixmap)
-          init_renderer(@pixmap)
-        end
-      end
-    end
-  end
-end

data/lib/rabbit/renderer/pixmap/cairo.rb

@@ -1,15 +0,0 @@
-require "rabbit/renderer/engine/cairo"
-require "rabbit/renderer/pixmap/base"
-require "rabbit/renderer/pixmap/gl"
-
-module Rabbit
-  module Renderer
-    module Pixmap
-      class Cairo
-        include Engine::Cairo
-        include GL
-        include Base
-      end
-    end
-  end
-end

data/lib/rabbit/renderer/pixmap/gl.rb

@@ -1,46 +0,0 @@
-begin
-  require "rabbit/renderer/gl"
-rescue LoadError
-end
-
-module Rabbit
-  module Renderer
-    module Pixmap
-      module GL
-        include Renderer::GL if defined?(Renderer::GL)
-
-        private
-        def init_renderer(drawable)
-          if gl_available?
-            super(@gl_drawable)
-          else
-            super
-          end
-        end
-
-        def init_gl_capability(drawable)
-          return unless gl_available?
-          mode = ::Gdk::GLConfig::MODE_RGBA
-          mode |= ::Gdk::GLConfig::MODE_DEPTH
-          # gl_config = ::Gdk::GLConfig.new(mode | ::Gdk::GLConfig::MODE_DOUBLE)
-          gl_config = ::Gdk::GLConfig.new(mode)
-          if drawable.method(:set_gl_capability).arity == 2
-            @gl_drawable = drawable.set_gl_capability(gl_config, nil)
-          else
-            @gl_drawable = drawable.set_gl_capability(gl_config)
-          end
-          @gl_context = ::Gdk::GLContext.new(@gl_drawable, nil, false,
-                                             ::Gdk::GL::RGBA_TYPE)
-        end
-
-        def gl_drawable
-          @gl_drawable
-        end
-
-        def gl_context
-          @gl_context
-        end
-      end
-    end
-  end
-end