tdiary 4.0.1.20130903 → 4.0.1.20130929

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f04df177eb9cdb1da5cdf4c260a2ce21acf5adca
-  data.tar.gz: fb82eb586136566043abcc0bd178b4265233c329
+  metadata.gz: 3cb15a291ccf22c9e26d5007c81a8a0d7872217d
+  data.tar.gz: e1967f9cf308aaf0dffa1ccd5cd04e4ca3ee63a2
 SHA512:
-  metadata.gz: 9a0fcf194925de5285c50782ee68d6deb455df5ec924a944199648995589bdeca8765f7e6327dec8541d7beec486058d30ca95c03b79bbb3a2ccf0a2daedd8eb
-  data.tar.gz: 06a7c5e731b231804d917a37f0b057ab444fd8d13f8daecbc1344378ec1d797f7278a10c8167f0c42e003b41bc067440fb587935865759f1176065feed156f45
+  metadata.gz: 3eebdfd11165028ff3b35fd9731b5f6b5e3c5712c2b96dc8b91666d5f59a3dee08bd0d2134988ec1a8bed70e062f99849293f76e5b77608a598f58cd6584b8d7
+  data.tar.gz: c78628a2c55c3f0a0c9cb87cc46072aa7439fb8be24cc5bdc35757923fd87e3e65ca6cb81764488582f5149004cfed4b623a17838240a42d143af520c44a9eac

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'rack'
 gem 'sprockets'
 gem 'hikidoc'
-gem 'rdtool'
 gem 'fastimage'
 
 group :coffee do
@@ -20,12 +19,6 @@ group :redis do
   gem 'redis-namespace'
 end
 
-group :gfm do
-  gem 'redcarpet'
-  gem 'pygments.rb'
-  gem 'twitter-text', :require => false
-end
-
 group :server do
   platforms :mri do
     gem 'thin'

data/Gemfile.lock

@@ -15,19 +15,18 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
+    coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
     daemons (1.1.9)
     dalli (2.6.4)
     diff-lcs (1.2.4)
     eventmachine (1.0.3)
-    execjs (2.0.0)
-    fastimage (1.5.0)
+    execjs (2.0.1)
+    fastimage (1.5.2)
     ffi (1.9.0)
     hike (1.2.3)
     hikidoc (0.0.6)
@@ -41,20 +40,16 @@ GEM
       addressable (~> 2.3)
     libv8 (3.16.14.3)
     method_source (0.8.2)
-    mime-types (1.24)
+    mime-types (1.25)
     mini_portile (0.5.1)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     pit (0.0.7)
-    posix-spawn (0.3.6)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.5.2)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -62,8 +57,6 @@ GEM
       rack (>= 1.0)
       rack-test (>= 0.5)
     rake (10.1.0)
-    rdtool (0.6.38)
-    redcarpet (3.0.0)
     redis (3.0.4)
     redis-namespace (1.3.1)
       redis (~> 3.0.0)
@@ -75,16 +68,16 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
     rubyzip (0.9.9)
-    selenium-webdriver (2.35.0)
+    selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
-    sequel (4.1.1)
+    sequel (4.2.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -98,6 +91,8 @@ GEM
     sqlite3 (1.3.8)
     tapp (1.4.0)
       thor
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     test-unit (2.5.5)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
@@ -108,15 +103,10 @@ GEM
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
-    twitter-text (1.6.1)
-      unf (~> 0.0.5)
-    unf (0.0.5)
-      unf_ext
-    unf_ext (0.0.6)
+    tins (0.11.0)
     websocket (1.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -132,12 +122,9 @@ DEPENDENCIES
   launchy
   pit
   pry
-  pygments.rb
   rack
   racksh
   rake
-  rdtool
-  redcarpet
   redis
   redis-namespace
   rspec
@@ -151,4 +138,3 @@ DEPENDENCIES
   therubyracer
   thin
   trinidad
-  twitter-text

data/spec/core/style/tdiary_style_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 require 'tdiary'
-require 'tdiary/style/tdiary_style'
+require 'tdiary/style/tdiary'
 
 describe TDiary::Style::TdiaryDiary do
 	before do

data/spec/core/style/wiki_style_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 require 'tdiary'
-require 'tdiary/style/wiki_style'
+require 'tdiary/style/wiki'
 
 describe TDiary::Style::WikiDiary do
 	before do

data/tdiary/io/base.rb

@@ -4,6 +4,7 @@
 #  base of IO class
 #
 require 'fileutils'
+require 'tdiary/style' # XXX can't auto loading TDiary::Style subclasses
 
 module TDiary
 	class BaseIO
@@ -38,16 +39,19 @@ module TDiary
 		def load_styles
 			@styles = {}
 			paths = @tdiary.conf.options['style.path'] ||
-				[TDiary::PATH, TDiary.server_root].map {|base|
-					["#{base}/tdiary/style", "#{base}/tdiary"]
-				}
+				[TDiary::PATH, TDiary.server_root].map {|base| "#{base}/tdiary/style" }
 			[paths].flatten.uniq.each do |path|
 				path = path.sub(/\/+$/, '').untaint
-				Dir.glob("#{path}/*_style.rb") do |style_file|
-					require style_file.untaint
-					style = File.basename(style_file).sub(/_style\.rb$/, '')
-					@styles[style] = TDiary::Style.const_get("#{style.capitalize}Diary")
+				Dir.glob("#{path}/*.rb") {|style_file| require style_file.untaint }
+			end
+			(["tdiary", "wiki"] + [@tdiary.conf.style].map(&:downcase)).flatten.uniq.each do |style|
+				klass = TDiary::Style.const_get("#{style.capitalize}Diary")
+				klass.send(:include, TDiary::Style::BaseDiary)
+				klass.send(:include, TDiary::Style::CategorizableDiary)
+				if TDiary::Style.const_defined? ("#{style.capitalize}Section")
+					TDiary::Style.const_get("#{style.capitalize}Section").send(:include, TDiary::Style::BaseSection)
 				end
+				@styles[style] = klass
 			end
 		end
 

data/tdiary/style/{tdiary_style.rb → tdiary.rb}

@@ -117,9 +117,6 @@ module TDiary
 		end
 
 		class TdiaryDiary
-			include BaseDiary
-			include CategorizableDiary
-
 			def initialize( date, title, body, modified = Time::now )
 				init_diary
 				replace( date, title, body )

data/tdiary/style/{wiki_style.rb → wiki.rb}

@@ -15,8 +15,6 @@ require 'hikidoc'
 module TDiary
 	module Style
 		class WikiSection
-			include BaseSection
-
 			def initialize( fragment, author = nil )
 				@author = author
 				if fragment[0] == ?! then
@@ -154,9 +152,6 @@ module TDiary
 		end
 
 		class WikiDiary
-			include BaseDiary
-			include CategorizableDiary
-
 			def initialize( date, title, body, modified = Time.now )
 				init_diary
 				replace( date, title, body )

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '4.0.1.20130903'
+	VERSION = '4.0.1.20130929'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 4.0.1.20130903
+  version: 4.0.1.20130929
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -239,18 +239,6 @@ files:
 - misc/plugin/xmlrpc.rb
 - misc/plugin/xmlrpc/README
 - misc/plugin/xmlrpc/xmlrpc.rb
-- misc/style/emptdiary/README.rd
-- misc/style/emptdiary/README.rd.en
-- misc/style/emptdiary/emptdiary_style.rb
-- misc/style/etdiary/README.rd
-- misc/style/etdiary/etdiary_style.rb
-- misc/style/gfm/gfm_style.rb
-- misc/style/rd/README.rd
-- misc/style/rd/rd_style.rb
-- misc/style/wiki/README
-- misc/style/wiki/README.en
-- misc/style/wiki/wiki_parser.rb
-- misc/style/wiki/wiki_style.rb
 - misc/templates/Gemfile.local.erb
 - misc/theme_convert/Readme.rd
 - misc/theme_convert/append.rcss
@@ -327,10 +315,6 @@ files:
 - spec/core/rack/html_anchor_spec.rb
 - spec/core/rack/static_spec.rb
 - spec/core/rack/valid_request_path_spec.rb
-- spec/core/style/emptdiary_style_spec.rb
-- spec/core/style/etdiary_style_spec.rb
-- spec/core/style/gfm_style_spec.rb
-- spec/core/style/rd_style_spec.rb
 - spec/core/style/tdiary_style_spec.rb
 - spec/core/style/wiki_style_spec.rb
 - spec/fixtures/ascii8bit-pstore.db
@@ -398,8 +382,8 @@ files:
 - tdiary/response.rb
 - tdiary/server.rb
 - tdiary/style.rb
-- tdiary/style/tdiary_style.rb
-- tdiary/style/wiki_style.rb
+- tdiary/style/tdiary.rb
+- tdiary/style/wiki.rb
 - tdiary/tasks.rb
 - tdiary/tasks/assets.rake
 - tdiary/tasks/auth.rake
@@ -456,7 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: a TSUKKOMI-able Web-log
@@ -487,10 +471,6 @@ test_files:
 - spec/core/rack/html_anchor_spec.rb
 - spec/core/rack/static_spec.rb
 - spec/core/rack/valid_request_path_spec.rb
-- spec/core/style/emptdiary_style_spec.rb
-- spec/core/style/etdiary_style_spec.rb
-- spec/core/style/gfm_style_spec.rb
-- spec/core/style/rd_style_spec.rb
 - spec/core/style/tdiary_style_spec.rb
 - spec/core/style/wiki_style_spec.rb
 - spec/fixtures/ascii8bit-pstore.db

data/misc/style/emptdiary/README.rd

@@ -1,83 +0,0 @@
-=begin
-= emptDiaryスタイル((-$Id: README.rd,v 1.6 2008-03-02 09:01:20 kazuhiko Exp $-))
-
-== 概要
-((:emptDiaryスタイル:))((-emptDiaryは'empty line permitted tDiary style'
-を省略したものです。長いねぇ。-))は、((:tDiaryス タイル:))に加えて、プラ
-グインの引数に空白行を許すスタイルです。このスタイルを使うと、日記をセク
-ションに分ける際に、<%と%>の間の空白行を無視してもらえます。
-
-日記にプログラムリストなどを書く場合に、リストが空白行を含むと、
-((:tDiaryス タイル:))ではリストの途中から次のセクションになってしまいま 
-す。((:emptDiaryスタイル:))では、プラグインの引数の中の空白を無視するの
-で、例えばpre.rbプラグインのヒアドキュメントとしてプログラムリストを記述
-することで、プログラムリストに何の変更もなく、日記にリストを書くことがで
-きます。
-
-((:emptDiaryスタイル:))の最新版は、
-((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/emptdiary_style.rb>))から、
-このファイルの最新版は、
-((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/README.rd>))か
-ら、 入手できるでしょう。
-
-また、pre.rbの最新版は、
-((<URL:http://zunda.freeshell.org/d/plugin/pre.rb>))から入手できるはずで
-す。
-
-== Usage
-このスタイルを使うには、
-(1) emptdiary_style.rb ファイルを、tdiary/ ディレクトリにコピーしてくだ
-    さい。tdiary/ ディレクトリは、tdiary.rb ファイルのあるトップディレク
-    トリの下にあります。
-(2) tdiary.confに以下の行を書いてください。
-      @style = 'emptDiary'
-
-日記は、((:tDiaryスタイル:))とほとんど同じように書くことができます。
-HOWTO-write-tDiary.htmlに書かれている通り、
-* 空白無しで始まる行は、((:セクションタイトル:))になります。この行には、
-  ((:セクションアンカー:))が付きます。
-* ((:セクションタイトル:))に続く行は、その((:セクション:))の内容になりま
-  す。
-* 空白行によって、次の((:セクション:))と分かれます。
-* ((:セクション:))の最初の行を空白や<で始めることによって、
-  ((:セクションタイトル:))の無い((:セクション:))を作ることができます。
-
-((:emptDiaryスタイル:))では、上記のルールに加えて、
-* <%と%>に囲まれた空白行は、セクションを分割する際に無視されます。つまり、
-  あるセクションに、<%と%>に囲まれた空白行を含めることができます。
-* 副作用として、日記には、<%と%>が同数、それぞれペアになって含まれていな
-  いといけません。
-
-つまり、pre.rbを使って、
-  セクションタイトル
-  <p>セクションの内容</p>
-  <%=pre <<'_PRE'
-  #include <stdio.h>
-
-  /* 上記は空白行 */
-  int
-  main (int argc, char *argv[])
-  {
-    puts ("Hello world.");
-  }
-  _PRE
-  %>
-などというセクションを作ることができます。不等号やアンパーサンドの実体参
-照への変換は、pre.rbで行われることに注意してください。
-
-== 謝辞
-このスタイルは、((:tDiaryスタイル:))のTdiarySectionとTdiaryDiaryをsuper
-classとして実装されています。このようなフレキシブルなクラスを提供されて
-いる、tdiary_style.rbの著者の方々に感謝します。
-
-== 著作権
-Copyright 2003 zunda <zunda at freeshell.org>
-
-Permission is granted for use, copying, modification, distribution,
-and distribution of modified versions of this work under the terms
-of GPL version 2 or later.                                                  
-=end
-=begin ChangeLog
-* Mon Feb 17, 2003 zunda <zunda at freeshell.org>
-- first draft
-=end

data/misc/style/emptdiary/README.rd.en

@@ -1,78 +0,0 @@
-=begin
-= emptDiary style((-$Id: README.rd.en,v 1.5 2003-11-06 09:43:46 zunda Exp $-))
-
-== Summary
-((:emptDiary style:))((-emptDiary is an abbreviation for 'empty line
-permitted tDiary style'. Very long, isn't it?-)) is an extension to the
-((:tDiary style:)) which allows plug-in arguments to have empty lines.
-In short, this style preserves empty lines between <% and %> when
-splltting the input into sections.
-
-Sometimes, you would want to include your program list in your diary. In
-the case, the ((:tDiary style:)) rule gets in the way: an empty line in
-the program list makes a second section. ((:emptDiary style:)) permits
-empty lines in the arguments of plug-ins. Thus, using e.g. pre.rb
-plugin, you can show your program list without modifying your it.
-
-
-The latest version of this style can be downloaded from
-((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/emptdiary_style.rb>)),
-and the latest version of this document can be downloaded from
-((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/README.rd.en>)).
-
-== Usage
-If you want to use this style
-(1) copy the file emptdiary_style.rb into the tdiary/ directory under
-    the top directory where tdiary.rb sits.
-(2) add the following line into tdiary.conf:
-      @style = 'emptDiary'
-
-You can write your diaries in almost the same manner as you have done
-with the tDiary style as described in the file HOWTO-write-tDiary.html.
-In short:
-* A line beginning without a space becomes a ((:section title:)) with a
-  ((:section anchor:)),
-* Lines following the ((:section title:)) become the body of the
-  ((:section:)),
-* An empty line changes ((:section:))s, but
-* You can create a ((:section:)) with a ((:section anchor:)) but a
-  ((:section title:)) with the first line beginning with a space.
-
-((:emptDiary style:)) adds the follwing rules:
-* Empty lines between <% and %> are ignored when parsing your text into
-  sections. Thus, you can include empty lines between <% and %>.
-As a side effect
-* You have to keep <% and %>'s in the pairs.
-
-Thus, using pre.rb plugin, you can write ((*A*)) section like:
-  title of the section
-  <p>Descriptino of the program</p>
-  <%=pre <<'_PRE'
-  #include <stdio.h>
-
-  /* above is an empty line */
-  int
-  main (int argc, char *argv[])
-  {
-    puts ("Hello world.");
-  }
-  _PRE
-  %>
-Please note that the <, >, and & charactors are escaped by the pre plugin.
-
-== Acknowledgements
-This style is realized using TdiarySection and TdiaryDiary as
-super-classes. I thank the authors of tdiary_style.rb for providing such
-flexible classes.
-
-== Copyright
-Copyright 2003 zunda <zunda at freeshell.org>
-
-Permission is granted for use, copying, modification, distribution,
-and distribution of modified versions of this work under the terms
-of GPL version 2 or later.                                                  
-=end
-=begin ChangeLog
-* Mon Feb 17, 2003 zunda <zunda at freeshell.org>
-- first draft
-=end

data/misc/style/emptdiary/emptdiary_style.rb

@@ -1,201 +0,0 @@
-# -*- coding: utf-8; -*-
-=begin
-= emptDiary style((-$Id: emptdiary_style.rb,v 1.11 2008-03-02 09:01:20 kazuhiko Exp $-))
-
-== Summary
-This style is an extension to the tDiary style which allows plug-in
-arguments to have empty lines. In short, this style preserves empty
-lines between <% and %> when splltting the input into sections.
-
-The latest version of this file can be downloaded from
-((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/emptdiary_style.rb>)).
-
-== Usage
-if you want to use this style, add the following line into tdiary.conf:
-  @style = 'emptdiary'
-Please see  README.rd or README.rd.en for further explanation.
-
-== Acknowledgements
-This style is realized using TdiarySection and TdiaryDiary as
-super-classes. I thank the authors of tdiary_style.rb for providing such
-flexible classes.
-
-EmptdiaryDiary::to_html4 and EmptdiaryDiary::to_chtml are copied from
-tdiary_style.rb and slightly edited as follows:
-* split_unless_plugin() is inserted before each collect()
-* Regexp is chanegd from ^ to \A
-
-== Copyright
-Copyright 2003 zunda <zunda at freeshell.org>
-
-Permission is granted for use, copying, modification, distribution,
-and distribution of modified versions of this work under the terms
-of GPL version 2 or later.                                                  
-=end
-=begin ChangeLog
-* Mon Feb 17, 2003 zunda <zunda at freeshell.org>
-- copied from zunda_style.rb, with which I used for preliminary tests.
-* Wed Feb 26, 2003 zunda <zunda at freeshell.org>
-- TDiary::Emptdiary::String class to handle strings better
-	(Thanks to Mitsuru Shimamura <mitsuru at diana.dti.ne.jp> for the
-	error report)
-* Wed Dec 22, 2004 zunda <zunda at freeshell.org>
-- override body_to_html
-=end
- 
-require 'tdiary/style/tdiary_style'
-
-=begin
-== Classes and methods defined in this style
-Please note that not all are documented.
-=end
-
-module TDiary
-	module Style
-=begin
-=== TDiary::Emptdiary::EmptdiaryString < String
-Extended String class not to divide things between <% and %>.
-
---- TDiary::Emptdiary::EmptdiaryString.split_unless_plugin ( delimiter = "\n\n" )
-      Returns an array of EmptdiaryString splitted at ((|delimiter|))
-      which is outside of <% and %> pairs. Specify ((|delimiter|)) as a
-      String showing a fragment of Regexp. This will be combined in a
-      Regexp like: /(#{delimiter)|<%|%>)/.
-=end
-		class Emptdiary
-			class EmptdiaryString < String
-				def split_unless_plugin( delimiter = "\n\n+" )
-					result = Array.new
-					fragment = ''
-					nest = 0
-					remain = self.gsub(/.*?(#{delimiter}|<%|%>)/m) do
-						fragment += $&
-						case $1
-						when '<%'
-							nest += 1
-						when '%>'
-							nest -= 1
-						else
-							if nest == 0 then
-								fragment.sub!( /#{delimiter}\z/, '' )
-								result << Emptdiary::EmptdiaryString.new( fragment ) unless fragment.empty?
-								fragment = ''
-							end
-						end
-						''
-					end
-					fragment += remain
-					fragment.sub!( /#{delimiter}\z/, '' )
-					result << Emptdiary::EmptdiaryString.new( fragment ) unless fragment.empty?
-					result
-				end
-			end
-		end
-
-=begin
-=== TDiary::EmptdiartySection < TdiarySection
-Almost the same as TdiarySection but usess split_unless_plugin instead
-of split. initialize method is overrideen.
-=end
-		class EmptdiarySection < TdiarySection
-			def initialize( fragment, author = nil )
-				@author = author
-				lines = fragment.split_unless_plugin( "\n+" )
-				if lines.size > 1 then
-					if /\A<</ =~ lines[0]
-						@subtitle = lines.shift.chomp.sub( /\A</, '' )
-					elsif /\A[　 <]/u !~ lines[0]
-						@subtitle = lines.shift.chomp
-					end
-				end
-				@body = Emptdiary::EmptdiaryString.new( lines.join( "\n" ) )
-				@categories = get_categories
-				@stripped_subtitle = strip_subtitle
-			end
-
-			def body_to_html
-				html = ""
-				@body.split_unless_plugin( "\n" ).each do |p|
-					if /\A</ =~ p then
-						html << p
-					else
-						html << "<p>#{p}</p>"
-					end
-				end
-				html
-			end
-		end
-
-=begin
-=== TDiary::EmptdiaryDiary < TdiaryDiary
-Almost the same as TdiarySection but usess split_unless_plugin instead
-of split. append method is overriden and makes EmptdiarySection with
-body being an EmptdiaryString. Also, to_html4 and to_chtml methods are
-overridden to split_unless_plugin before collect'ing the body of the
-sections.
-=end
-		class EmptdiaryDiary < TdiaryDiary
-			def style
-				'emptdiary'
-			end
-			
-			def append( body, author = nil )
-				Emptdiary::EmptdiaryString.new(body.gsub( /\r/, '' )).split_unless_plugin( "\n\n+" ).each do |fragment|
-					section = EmptdiarySection::new( fragment, author )
-					@sections << section if section
-				end
-				@last_modified = Time::now
-				self
-			end
-
-			def to_html4( opt )
-				r = ''
-				each_section do |section|
-					r << %Q[<div class="section">\n]
-					r << %Q[<%=section_enter_proc( Time::at( #{date.to_i} ) )%>\n]
-					if section.subtitle then
-						r << %Q[<h3><%= subtitle_proc( Time::at( #{date.to_i} ), #{section.subtitle.dump.gsub( /%/, '\\\\045' )} ) %></h3>\n]
-					end
-					if /\A</ =~ section.body then
-						r << %Q[#{section.body}]
-					elsif section.subtitle
-						r << %Q[<p>#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '')}.join( "</p>\n<p>" )}</p>]
-					else
-						r << %Q[<p><%= subtitle_proc( Time::at( #{date.to_i} ), nil ) %>]
-						r << %Q[#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '' )}.join( "</p>\n<p>" )}</p>]
-					end
-					r << %Q[<%=section_leave_proc( Time::at( #{date.to_i} ) )%>\n]
-					r << %Q[</div>]
-				end
-				r
-			end
-
-			def to_chtml( opt )
-				r = ''
-				each_section do |section|
-					r << %Q[<%=section_enter_proc( Time::at( #{date.to_i} ) )%>\n]
-					if section.subtitle then
-						r << %Q[<H3><%= subtitle_proc( Time::at( #{date.to_i} ), #{section.subtitle.dump.gsub( /%/, '\\\\045' )} ) %></H3>\n]
-					end
-					if /\A</ =~ section.body then
-						r << section.body
-					elsif section.subtitle
-						r << %Q[<P>#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '' )}.join( "</P>\n<P>" )}</P>]
-					else
-						r << %Q[<P><%= subtitle_proc( Time::at( #{date.to_i} ), nil ) %>]
-						r << %Q[#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '' )}.join( "</P>\n<P>" )}</P>]
-					end
-					r << %Q[<%=section_leave_proc( Time::at( #{date.to_i} ) )%>\n]
-				end
-				r
-			end
-		end
-	end
-end
-
-# Local Variables:
-# mode: ruby
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# End: