Changeset 2813

Timestamp:

12/08/07 00:16:27 (13 months ago)

Author:

frsyuki

Message:

r241@xcore: frsyuki | 2007-12-08 00:16:21 +0900
lang/ruby/wikiforme: S6記法をarticle.4meに統合 1

Location:

lang/ruby/wikiforme/trunk

Files:

• bundles/article.4me/article.rb (modified) (1 diff)
• bundles/article.4me/div.rb (modified) (1 diff)
• bundles/article.4me/s6.rb (added)
• core/wikiforme/assemble.rb (modified) (1 diff)
• ui-cli/main.rb (modified) (1 diff)

lang/ruby/wikiforme/trunk/bundles/article.4me/article.rb

@@ -141 +141 @@
 # :@contentsグループに属する要素と、:@blankグループに属する
 # 要素と、:chapter要素、:part要素を含むことができる
-f.contain :@contents, :@blank, :chapter, :part, :manual_divide
+f.contain :@contents, :@pagers, :@blank, :chapter, :part
 
 # 変換メソッド

lang/ruby/wikiforme/trunk/bundles/article.4me/div.rb

@@ -15 +15 @@
 f.default_syntax '#div'
 f.parent :body
-f.contain :@contents, :@blank, :chapter, :part, :section, :subsection
+f.group :@pagers
+f.contain :@contents, :@blank, :chapter, :part, :section, :subsection, :@pagers
 f.uncontain :manual_divide
 f.module_eval {

lang/ruby/wikiforme/trunk/core/wikiforme/assemble.rb

@@ -45 +45 @@
                                 context.push(element, text, lines)
                         rescue
-                                raise AssembleError, "#{$!} on file #{name}, line #{n}"
+                                ex = AssembleError.new("#{$!} on file #{name}, line #{n}")
+                                ex.set_backtrace($!.backtrace)  # バックトレースは元の例外のものをセット
+                                raise ex
                         end
                 }

lang/ruby/wikiforme/trunk/ui-cli/main.rb

@@ -172 +172 @@
 rescue WikiForme::WikiFormeError
         $stderr.puts "WikiForme Error:"
-        puts $!.to_s
+        puts '  '+$!
         if defined? DEBUG && DEBUG
                 $stderr.puts "Backtrace:"