* tdiary/wiki_style.rb (to_html): support multi-line plugins.

git-svn-id: https://tdiary.svn.sourceforge.net/svnroot/tdiary/trunk/core@2474 7f22e88f-374d-0410-998f-c91420d97ba2
tdiary · Oct 15, 2005 · 059d62e · 059d62e
1 parent 9acc54e
commit 059d62e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2005-10-15  Kazuhiko  <kazuhiko@fdiary.net>
+	* tdiary/wiki_style.rb (to_html): support multi-line plugins.
+
 2005-10-12 TADA Tadashi <sho@spc.gr.jp>
 	* tdiary.rb, *_style.rb, theme/base.css: add section_enter/leave_proc.
 

diff --git a/tdiary.rb b/tdiary.rb
@@ -1,13 +1,13 @@
 =begin
 == NAME
 tDiary: the "tsukkomi-able" web diary system.
-tdiary.rb $Revision: 1.254 $
+tdiary.rb $Revision: 1.255 $
 
 Copyright (C) 2001-2005, TADA Tadashi <sho@spc.gr.jp>
 You can redistribute it and/or modify it under GPL2.
 =end
 
-TDIARY_VERSION = '2.1.3.20051012'
+TDIARY_VERSION = '2.1.3.20051015'
 
 require 'cgi'
 require 'uri'

diff --git a/tdiary/wiki_style.rb b/tdiary/wiki_style.rb
@@ -1,5 +1,5 @@
 #
-# Wiki_style.rb: Wiki style for tDiary 2.x format. $Revision: 1.14 $
+# Wiki_style.rb: Wiki style for tDiary 2.x format. $Revision: 1.15 $
 #
 # if you want to use this style, add @style into tdiary.conf below:
 #
@@ -109,10 +109,10 @@ def to_s
 	private
 		def to_html( string )
 			html = HikiDoc::new( string, :level => 3, :empty_element_suffix => '>'  ).to_html.strip
-			html.gsub!( %r!<span class="plugin">\{\{(.+?)\}\}</span>! ) do
+			html.gsub!( %r!<span class="plugin">\{\{(.+?)\}\}</span>!m ) do
 				"<%=#{CGI.unescapeHTML($1)}%>"
 			end
-			html.gsub!( %r!<div class="plugin">\{\{(.+?)\}\}</div>! ) do
+			html.gsub!( %r!<div class="plugin">\{\{(.+?)\}\}</div>!m ) do
 				"<p><%=#{CGI.unescapeHTML($1)}%></p>"
 			end
 			html.gsub!( %r!<a href="(.+?)">(.+?)</a>! ) do