rabbit 1.0.5 → 1.0.6

data/doc/_site/ja/rd.html

@@ -536,7 +536,7 @@ rubyapi2
 
 
     <footer>
-      <p class="copyright">&copy; 2004-2011 Kouhei Sutou.</p>
+      <p class="copyright">&copy; 2004-2012 Kouhei Sutou.</p>
     </footer>
     <script src="http://connect.facebook.net/ja_JP/all.js"></script>
     <script>

data/doc/_site/ja/sample/hiki/rabbit.html

@@ -361,7 +361,7 @@ end
 
 
     <footer>
-      <p class="copyright">&copy; 2004-2011 Kouhei Sutou.</p>
+      <p class="copyright">&copy; 2004-2012 Kouhei Sutou.</p>
     </footer>
     <script src="http://connect.facebook.net/ja_JP/all.js"></script>
     <script>

data/doc/_site/ja/sample/index.html

@@ -88,7 +88,7 @@
 
 
     <footer>
-      <p class="copyright">&copy; 2004-2011 Kouhei Sutou.</p>
+      <p class="copyright">&copy; 2004-2012 Kouhei Sutou.</p>
     </footer>
     <script src="http://connect.facebook.net/ja_JP/all.js"></script>
     <script>

data/doc/_site/ja/sample/rd/rabbit.html

@@ -551,7 +551,7 @@ URL先の画像をダウンロード
 
 
     <footer>
-      <p class="copyright">&copy; 2004-2011 Kouhei Sutou.</p>
+      <p class="copyright">&copy; 2004-2012 Kouhei Sutou.</p>
     </footer>
     <script src="http://connect.facebook.net/ja_JP/all.js"></script>
     <script>

data/doc/_site/ja/slides.html

@@ -113,7 +113,7 @@
 
 
     <footer>
-      <p class="copyright">&copy; 2004-2011 Kouhei Sutou.</p>
+      <p class="copyright">&copy; 2004-2012 Kouhei Sutou.</p>
     </footer>
     <script src="http://connect.facebook.net/ja_JP/all.js"></script>
     <script>

data/doc/_site/ja/usage.html

@@ -420,7 +420,7 @@ change-source, source, allから選びます．後ろに挙げた公開
 
 
     <footer>
-      <p class="copyright">&copy; 2004-2011 Kouhei Sutou.</p>
+      <p class="copyright">&copy; 2004-2012 Kouhei Sutou.</p>
     </footer>
     <script src="http://connect.facebook.net/ja_JP/all.js"></script>
     <script>

data/doc/_site/ja/users.html

@@ -303,7 +303,7 @@ Subject: イー
 
 
     <footer>
-      <p class="copyright">&copy; 2004-2011 Kouhei Sutou.</p>
+      <p class="copyright">&copy; 2004-2012 Kouhei Sutou.</p>
     </footer>
     <script src="http://connect.facebook.net/ja_JP/all.js"></script>
     <script>

data/doc/en/news.rd

@@ -3,6 +3,20 @@ layout: en
 title: News
 apply_data: false
 ---
+== 1.0.6: 2012-03-03
+
+CodeRay 1.0.x support release.
+
+=== Improvements
+
+==== rabbit
+
+  * Supported CodeRay 1.0.x. [Reported by TAKATSU Tomonari]
+
+=== Thanks
+
+  * TAKATSU Tomonari
+
 == 1.0.5: 2012-01-30
 
 Markdown support release!

data/doc/index.html.en

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p><a href="/en/news.html">1.0.5</a> is the latest release. It had been released at 2012-01-30.</p>
+  <p><a href="/en/news.html">1.0.6</a> is the latest release. It had been released at 2012-03-03.</p>
 </div>
 
 <section class="screenshots">

data/doc/index.html.ja

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p>2012-01-30にリリースされた<a href="/ja/news.html">1.0.5</a>が最新リリースです。</p>
+  <p>2012-03-03にリリースされた<a href="/ja/news.html">1.0.6</a>が最新リリースです。</p>
 </div>
 
 <section class="screenshots">

data/doc/ja/news.rd

@@ -3,6 +3,20 @@ layout: ja
 title: お知らせ
 apply_data: false
 ---
+== 1.0.6: 2012-03-03
+
+CodeRay 1.0.x対応リリース
+
+=== 改良
+
+==== rabbit
+
+  * CodeRay 1.0.xに対応。 [TAKATSU Tomonariさんが報告]
+
+=== 感謝
+
+  * TAKATSU Tomonariさん
+
 == 1.0.5: 2012-01-30
 
 Markdown対応リリース！

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

@@ -21,7 +21,7 @@ module Rabbit
           def setup(options)
             super
             @out = SyntaxHighlightingBlock.new
-            @elements = [@out]
+            @containers = [@out]
           end
 
           def text_token(text, type=:plain)
@@ -29,36 +29,39 @@ module Rabbit
             escaped_text = Escape.escape_meta_character(text)
             text_element = SyntaxHighlightingText.new(Text.new(escaped_text))
             tag_name = type.to_s.gsub(/_/, '-')
-            CustomTag.new("syntax-#{tag_name}", text_element)
+            tag = CustomTag.new("syntax-#{tag_name}", text_element)
+            current_container << tag
           end
 
-          def open_token(kind)
-            p [:open, kind] if Utils.syntax_highlighting_debug?
-            @out = TextContainer.new
-            @elements << @out
-            CustomTag.new("syntax-#{kind}")
+          def begin_group(kind)
+            p [:begin_group, kind] if Utils.syntax_highlighting_debug?
+            @containers << TextContainer.new
+            tag = CustomTag.new("syntax-#{kind}")
+            current_container << tag
           end
 
           def begin_line(kind)
             p [:begin_line, kind] if Utils.syntax_highlighting_debug?
-            nil
           end
 
           def end_line(kind)
             p [:end_line, kind] if Utils.syntax_highlighting_debug?
-            nil
           end
 
-          def close_token(kind)
-            p [:close, kind] if Utils.syntax_highlighting_debug?
-            block = @elements.pop
-            @out = @elements.last
-            block
+          def end_group(kind)
+            p [:end_group, kind] if Utils.syntax_highlighting_debug?
+            block = @containers.pop
+            current_container << block
           end
 
           def finish(options)
             super
           end
+
+          private
+          def current_container
+            @containers.last
+          end
         end
       end
     end

data/lib/rabbit/rabbit.rb

@@ -8,7 +8,7 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 
   TMP_DIR_NAME = ".tmp"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
-  requirement: &12892660 !ruby/object:Gem::Requirement
+  requirement: &21881320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12892660
+  version_requirements: *21881320
 - !ruby/object:Gem::Dependency
   name: rsvg2
-  requirement: &12891720 !ruby/object:Gem::Requirement
+  requirement: &21879640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12891720
+  version_requirements: *21879640
 - !ruby/object:Gem::Dependency
   name: poppler
-  requirement: &12891100 !ruby/object:Gem::Requirement
+  requirement: &21878160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12891100
+  version_requirements: *21878160
 - !ruby/object:Gem::Dependency
   name: hikidoc
-  requirement: &12890240 !ruby/object:Gem::Requirement
+  requirement: &21876900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12890240
+  version_requirements: *21876900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12889600 !ruby/object:Gem::Requirement
+  requirement: &21887080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12889600
+  version_requirements: *21887080
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &12888060 !ruby/object:Gem::Requirement
+  requirement: &21883860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12888060
+  version_requirements: *21883860
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &12887100 !ruby/object:Gem::Requirement
+  requirement: &21898260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12887100
+  version_requirements: *21898260
 - !ruby/object:Gem::Dependency
   name: rdtool
-  requirement: &12886480 !ruby/object:Gem::Requirement
+  requirement: &21897520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +98,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12886480
+  version_requirements: *21897520
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &12885660 !ruby/object:Gem::Requirement
+  requirement: &21896700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *12885660
+  version_requirements: *21896700
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &12901200 !ruby/object:Gem::Requirement
+  requirement: &21896060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12901200
+  version_requirements: *21896060
 - !ruby/object:Gem::Dependency
   name: twitter-stream
-  requirement: &12899460 !ruby/object:Gem::Requirement
+  requirement: &21895360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12899460
+  version_requirements: *21895360
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &12897760 !ruby/object:Gem::Requirement
+  requirement: &21894640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12897760
+  version_requirements: *21894640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12896160 !ruby/object:Gem::Requirement
+  requirement: &21892740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12896160
+  version_requirements: *21892740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12894500 !ruby/object:Gem::Requirement
+  requirement: &21891800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12894500
+  version_requirements: *21891800
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &12909160 !ruby/object:Gem::Requirement
+  requirement: &21905860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12909160
+  version_requirements: *21905860
 - !ruby/object:Gem::Dependency
   name: gettext
-  requirement: &12908200 !ruby/object:Gem::Requirement
+  requirement: &21904900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12908200
+  version_requirements: *21904900
 description: Rabbit is an RD-document-based presentation application.
 email:
 - kou@cozmixng.org