rabbit 0.9.3 → 1.0.0

data/sample/can_rabbit.rd

@@ -23,7 +23,6 @@ Rabbitを用いてプレゼンテーションを行うための資料はどの
 = 特徴
 
   * ソースはRD
-  * RWikiとの連携
   * テーマ
   * 多言語が扱える
 
@@ -41,19 +40,6 @@ Rabbitの入力ソースはRD((-Ruby Document-))という書式で記述し
 自然に構造化された文書を作成することができます．インライン書
 式が無ければRDで書かれた文書の可読性は高いと思います．
 
-=== RWikiとの連携
-
-RabbitはRWikiと連携して動作することができます．つまり，RWiki 
-のページを直接入力ソースとして読み込むことができます．
-
-これにより，資料をどこでも簡単に編集することができます．また，
-RWikiのバージョン管理機能を使うことにより，データの損失を気
-にせず，安心して資料を作成することができます．もし，Rabbitが
-インストールされていない環境でも，RWikiのスライド拡張を利用
-してプレゼンテーションを行うことができます．
-
-
-RWikiのページを直接入力ソースとして読み込む機能を一般化して，
 HTTPや，FTPを用いてネットワーク越しの入力ソースを直接読み込
 むこともできます．利用可能な入力方式は以下の通りです．
 
@@ -67,9 +53,6 @@ HTTPや，FTPを用いてネットワーク越しの入力ソースを直接読
    指定したURIから読み込む．スキームにはhttp，ftp，fileが使
    える．
 
-: RWiki
-   RWikiのページを読み込む．
-
 === テーマ
 
 Rabbitでは内容（RD）と見た目を分離するために，テーマ機能を提
@@ -325,10 +308,6 @@ EPS形式以外は，ファイルの内容から画像形式を自動認識す
 : URI
    指定したURIのファイル名を除いた部分
 
-: RWiki
-   指定したRWiki（のSOAP）インターフェイスのURIのファイル名
-   を除いた部分
-
 = 書式
 
    # _

data/sample/rabbit-en.hiki

@@ -68,7 +68,7 @@ A presentation tool
 * File
 * Standard input
 * HTTP
-* RWiki/Hiki
+* Hiki
 * SlideShare
 
 ! Features: Format
@@ -232,7 +232,7 @@ Create EPS ahead of time{{note('(needs gs)')}}
 {{image("rabbit.xcf",
         :relative_height => 100)}}
 
-= aafigure
+! aafigure
 
 {{aafigure("
 A   B   C   D   E   F   G   H   I   J   K   L   M
@@ -253,6 +253,25 @@ N   O   P   Q   R   S   T   U   V   W   X   Y   Z
 #            :foreground => "#ff3333",
            })}}
 
+! blockdiag
+
+{{blockdiag("
+{
+  fontsize = 25;
+  RD -> Rabbit;
+  Hiki -> Rabbit;
+  PDF -> Rabbit;
+  group {
+    Rabbit -> Display;
+  }
+}",
+            {
+              :relative_width => 90,
+#             :antialias => true,
+              :fonts => ["/usr/share/fonts/opentype/ipafont/ipag.ttf",
+                         "/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf"],
+            })}}
+
 ! Word Wrapping
 
 looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong

data/sample/rabbit-en.rd

@@ -75,7 +75,7 @@ A presentation tool
   * File
   * Standard input
   * HTTP
-  * RWiki/Hiki
+  * Hiki
   * SlideShare
 
 = Features: Format
@@ -265,6 +265,22 @@ Create EPS ahead of time((-needs gs-))
    nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
    nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
 
+= blockdiag
+
+  # blockdiag
+  # relative_width = 90
+#  # antialias = true
+  # fonts = /usr/share/fonts/opentype/ipafont/ipag.ttf, /usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
+  {
+    fontsize = 25;
+    RD -> Rabbit;
+    Hiki -> Rabbit;
+    PDF -> Rabbit;
+    group {
+      Rabbit -> Display;
+    }
+  }
+
 = Word Wrapping
 
 looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong
@@ -280,7 +296,7 @@ The following is source code:
 
 End of source code.
 
-= Source: colorized
+= Source: Enscript
 
 The following is source code:
 
@@ -292,6 +308,30 @@ The following is source code:
 
 End of source code.
 
+= Source: CodeRay
+
+The following is source code:
+
+  # coderay ruby
+  # comment
+  def method_name
+    body
+  end
+
+End of source code.
+
+= Source: Emacs
+
+The following is source code:
+
+  # emacs # -*- ruby -*-
+  # comment
+  def method_name
+    body
+  end
+
+End of source code.
+
 = Quotation
 
   # blockquote

data/sample/rabbit-implementation.rd

@@ -25,7 +25,6 @@
     * 多言語対応
   * ソースはRD
     * 簡単に書ける
-    * RWikiのスライド拡張互換
 
 = ターゲット
 
@@ -66,10 +65,6 @@
     * 画像を並べるのは他のツール
     * ギャラリー，zphoto．．．
 
-  * RWikiのページとして公開
-    * ブラウザで閲覧
-    * Rabbitで閲覧
-
 = 実装
 
   * ページの構造

data/sample/rabbit.hiki

@@ -253,6 +253,25 @@ N   O   P   Q   R   S   T   U   V   W   X   Y   Z
 #            :option => "font=mikachan",
            })}}
 
+! blockdiag
+
+{{blockdiag("
+{
+  fontsize = 25;
+  RD -> Rabbit;
+  Hiki -> Rabbit;
+  PDF -> Rabbit;
+  group {
+    Rabbit -> 画面;
+  }
+}",
+            {
+              :relative_width => 90,
+#             :antialias => true,
+              :fonts => ["/usr/share/fonts/opentype/ipafont/ipag.ttf",
+                         "/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf"],
+            })}}
+
 ! 折り返し
 
 なーーーーーーーーーーーーーーーーーーーーーーーーーーーーーがーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーい行は？
@@ -310,22 +329,6 @@ end
 ||内容1||内容2
 ||長ーーーーーい内容3||長ーーーーーーーーーーーーーーーーーーい内容4
 
-! Anthy
-
-ひらがなをかんじにへんかんできます．
-
-いみもつかいみちもないです．
-
-
-''変換後:''
-
-{{anthy(<<-EOA)
-ひらがなをかんじにへんかんできます．
-
-いみもつかいみちもないです．
-EOA
-}}
-
 ! 操作: 移動
 
 :次ページ:次に進みそうなキー/左クリック\nn, f, j, l, Spc, Ret, +, {{e('DownArrow')}}, {{e('RightArrow')}}

data/sample/rabbit.rd

@@ -76,7 +76,7 @@
   * ファイル
   * 標準入力
   * HTTP
-  * RWiki/Hiki
+  * Hiki
   * SlideShare
 
 = 機能: 入力書式
@@ -264,6 +264,22 @@ URL先の画像をダウンロード
    nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
    nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
 
+= blockdiag
+
+  # blockdiag
+  # relative_width = 90
+#  # antialias = true
+  # fonts = /usr/share/fonts/opentype/ipafont/ipag.ttf, /usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
+  {
+    fontsize = 25;
+    RD -> Rabbit;
+    Hiki -> Rabbit;
+    PDF -> Rabbit;
+    group {
+      Rabbit -> 画面;
+    }
+  }
+
 = 折り返し
 
 なーーーーーーーーーーーーーーーーーーーーーーーーーーーーーがーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーい行
@@ -279,7 +295,7 @@ URL先の画像をダウンロード
 
 以上がソース
 
-= ソース: 色付き
+= ソース: Enscript
 
 以下がソース
 
@@ -291,6 +307,30 @@ URL先の画像をダウンロード
 
 以上がソース
 
+= ソース: CodeRay
+
+以下がソース
+
+  # coderay ruby
+  # comment
+  def method_name
+    body
+  end
+
+以上がソース
+
+= ソース: Emacs
+
+以下がソース
+
+  # emacs # -*- ruby -*-
+  # comment
+  def method_name
+    body
+  end
+
+以上がソース
+
 = 引用
 
   # blockquote
@@ -334,15 +374,6 @@ URL先の画像をダウンロード
   内容1, 内容2
   長ーーーーーい内容3, 長ーーーーーーーーーーーーーーーーーーい内容4
 
-= Anthy
-
-ひらがなをかんじにへんかんできます。
-
-((*変換後:*))
-
-  # anthy
-  ひらがなをかんじにへんかんできます。
-
 = 操作: 移動
 
 : 次ページ

data/sample/test.hiki

@@ -0,0 +1,31 @@
+! テスト
+
+:theme:default
+
+! blockdiag
+
+{{emacs(<<-EOS, "# -*- ruby -*-")
+# comment
+def method_name(a, b=nil, *rest)
+  @var = $hoge
+  1
+  if "sss" then
+    body
+  end
+end
+EOS
+}}
+
+! blockdiag
+
+{{coderay("ruby", <<-EOS)
+# comment
+def method_name(a, b=nil, *rest)
+  @var = $hoge
+  1
+  if "sss" then
+    body
+  end
+end
+EOS
+}}

data/sample/test.rab

@@ -0,0 +1,30 @@
+= テスト
+
+: theme
+   default
+
+= blockdiag
+
+#  # enscript ruby
+  # emacs # -*- ruby -*-
+  # comment
+  def method_name(a, b=nil, *rest)
+    @var = $hoge
+    1
+    if "sss" then
+      body
+    end
+  end
+
+= blockdiag
+
+#  # enscript ruby
+  # coderay ruby
+  # comment
+  def method_name(a, b=nil, *rest)
+    @var = $hoge
+    1
+    if "sss" then
+      body
+    end
+  end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rabbit
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 9
-  - 3
-  version: 0.9.3
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,12 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 Z
+date: 2011-07-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: gtk2
-  type: :runtime
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: gtk2
+  prerelease: false
+  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rsvg2
-  type: :runtime
-  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,11 +41,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rsvg2
+  prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: poppler
-  type: :runtime
-  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,11 +55,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: poppler
+  prerelease: false
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: hikidoc
-  type: :runtime
-  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -72,11 +69,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: hikidoc
+  prerelease: false
+  type: :runtime
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: twitter-stream
-  type: :runtime
-  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -86,11 +83,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: albino
+  prerelease: false
+  type: :runtime
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: twitter_oauth
-  type: :runtime
-  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -100,11 +97,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: nokogiri
+  prerelease: false
+  type: :runtime
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
-  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -114,11 +111,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rack
+  prerelease: false
+  type: :runtime
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  type: :development
-  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +125,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: haml
+  prerelease: false
+  type: :runtime
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: jekyll
-  type: :development
-  prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +139,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rdtool
+  prerelease: false
+  type: :runtime
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: gtk2
-  type: :runtime
-  prerelease: false
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -156,11 +153,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: coderay
+  prerelease: false
+  type: :runtime
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: rsvg2
-  type: :runtime
-  prerelease: false
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -170,11 +167,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: twitter-stream
+  prerelease: false
+  type: :development
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: poppler
-  type: :runtime
-  prerelease: false
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -184,11 +181,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: twitter_oauth
+  prerelease: false
+  type: :development
   requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: hikidoc
-  type: :runtime
-  prerelease: false
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -198,11 +195,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rake
+  prerelease: false
+  type: :development
   requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: twitter-stream
-  type: :runtime
-  prerelease: false
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -212,11 +209,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: jeweler
+  prerelease: false
+  type: :development
   requirement: *id014
 - !ruby/object:Gem::Dependency 
-  name: twitter_oauth
-  type: :runtime
-  prerelease: false
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -226,11 +223,29 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: jekyll
+  prerelease: false
+  type: :development
   requirement: *id015
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: gettext
+  prerelease: false
+  type: :development
+  requirement: *id016
 description: Rabbit is an RD-document-based presentation application.
 email: 
 - kou@cozmixng.org
 executables: 
+- rabbirack
 - rabrick
 - rabbit-command
 - rabbit
@@ -249,6 +264,7 @@ files:
 - Gemfile
 - README
 - Rakefile
+- bin/rabbirack
 - bin/rabbirc
 - bin/rabbit
 - bin/rabbit-command
@@ -256,6 +272,9 @@ files:
 - bin/rabbiter
 - bin/rabrick
 - bin/rabwii
+- data/locale/en/LC_MESSAGES/rabbit.mo
+- data/locale/fr/LC_MESSAGES/rabbit.mo
+- data/locale/ja/LC_MESSAGES/rabbit.mo
 - data/rabbit/image/clear-blue-images/clear-blue-headline-background.png
 - data/rabbit/image/clear-blue-images/clear-blue-icon.png
 - data/rabbit/image/clear-blue-images/clear-blue-images.rb
@@ -625,6 +644,7 @@ files:
 - lib/rabbit/element/preformatted.rb
 - lib/rabbit/element/slide-element.rb
 - lib/rabbit/element/slide.rb
+- lib/rabbit/element/syntax-highlighting.rb
 - lib/rabbit/element/table.rb
 - lib/rabbit/element/tag.rb
 - lib/rabbit/element/text-block-element.rb
@@ -658,10 +678,17 @@ files:
 - lib/rabbit/logger/gui.rb
 - lib/rabbit/logger/stderr.rb
 - lib/rabbit/menu.rb
+- lib/rabbit/middleware/config.ru
+- lib/rabbit/middleware/controller.rb
+- lib/rabbit/middleware/public/stylesheets/rabbirack.css
+- lib/rabbit/middleware/views/index.haml
+- lib/rabbit/middleware/views/layout.haml
 - lib/rabbit/parser.rb
 - lib/rabbit/parser/base.rb
 - lib/rabbit/parser/ext/aafigure.rb
-- lib/rabbit/parser/ext/anthy.rb
+- lib/rabbit/parser/ext/blockdiag.rb
+- lib/rabbit/parser/ext/coderay.rb
+- lib/rabbit/parser/ext/emacs.rb
 - lib/rabbit/parser/ext/enscript.rb
 - lib/rabbit/parser/ext/entity.rb
 - lib/rabbit/parser/ext/escape.rb
@@ -672,16 +699,12 @@ files:
 - lib/rabbit/parser/pause-support.rb
 - lib/rabbit/parser/pdf.rb
 - lib/rabbit/parser/rd.rb
-- lib/rabbit/parser/rd/ext/aafigure.rb
-- lib/rabbit/parser/rd/ext/anthy.rb
 - lib/rabbit/parser/rd/ext/base.rb
 - lib/rabbit/parser/rd/ext/block-verbatim.rb
-- lib/rabbit/parser/rd/ext/enscript.rb
 - lib/rabbit/parser/rd/ext/entity.rb
 - lib/rabbit/parser/rd/ext/image.rb
 - lib/rabbit/parser/rd/ext/inline-verbatim.rb
 - lib/rabbit/parser/rd/ext/refer.rb
-- lib/rabbit/parser/rd/ext/tex.rb
 - lib/rabbit/parser/rd/rd2rabbit-lib.rb
 - lib/rabbit/parser/rd/rt/rt2rabbit-lib.rb
 - lib/rabbit/parser/rd/visitor.rb
@@ -743,7 +766,6 @@ files:
 - lib/rabbit/source/file.rb
 - lib/rabbit/source/hiki.rb
 - lib/rabbit/source/memory.rb
-- lib/rabbit/source/rwiki.rb
 - lib/rabbit/source/slide-share.rb
 - lib/rabbit/source/uri.rb
 - lib/rabbit/stock.rb
@@ -810,6 +832,8 @@ files:
 - lib/rabbit/theme/debian/property.rb
 - lib/rabbit/theme/default-block-quote/default-block-quote.rb
 - lib/rabbit/theme/default-block-quote/property.rb
+- lib/rabbit/theme/default-comment/default-comment.rb
+- lib/rabbit/theme/default-comment/property.rb
 - lib/rabbit/theme/default-description/default-description.rb
 - lib/rabbit/theme/default-description/property.rb
 - lib/rabbit/theme/default-foot-text/default-foot-text.rb
@@ -879,8 +903,6 @@ files:
 - lib/rabbit/theme/newline-in-title/property.rb
 - lib/rabbit/theme/night-black/night-black.rb
 - lib/rabbit/theme/night-black/property.rb
-- lib/rabbit/theme/pdf-tortoise-and-hare/pdf-tortoise-and-hare.rb
-- lib/rabbit/theme/pdf-tortoise-and-hare/property.rb
 - lib/rabbit/theme/pdf/pdf.rb
 - lib/rabbit/theme/pdf/property.rb
 - lib/rabbit/theme/per-slide-background-color/per-slide-background-color.rb
@@ -948,6 +970,8 @@ files:
 - lib/rabbit/theme/slide-show/slide-show.rb
 - lib/rabbit/theme/stream-comment/property.rb
 - lib/rabbit/theme/stream-comment/stream-comment.rb
+- lib/rabbit/theme/syntax-highlighting/property.rb
+- lib/rabbit/theme/syntax-highlighting/syntax-highlighting.rb
 - lib/rabbit/theme/table/property.rb
 - lib/rabbit/theme/table/table.rb
 - lib/rabbit/theme/tag/property.rb
@@ -1067,6 +1091,8 @@ files:
 - sample/table-en.rd
 - sample/table.hiki
 - sample/table.rd
+- sample/test.hiki
+- sample/test.rab
 - sample/theme-bench-en.hiki
 - sample/theme-bench-en.rab
 - sample/theme-bench.hiki