tdiary 4.0.1 → 4.0.1.20130903

data/misc/style/gfm/gfm_style.rb

@@ -28,159 +28,161 @@ class HTMLwithPygments < Redcarpet::Render::HTML
 end
 
 module TDiary
-	class GfmSection
-		include SectionBase
-		include Twitter::Autolink
-
-		def initialize(fragment, author = nil)
-			@author = author
-			@subtitle, @body = fragment.split(/\n/, 2)
-			@subtitle.sub!(/^\#\s*/,'')
-			@body ||= ''
-
-			@categories = get_categories
-			@stripped_subtitle = strip_subtitle
-
-			@subtitle_to_html = @subtitle ? to_html('# ' + @subtitle).gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
-			@stripped_subtitle_to_html = @stripped_subtitle ? to_html('# ' + @stripped_subtitle).gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
-			@body_to_html = to_html(@body)
-		end
-
-		def subtitle=(subtitle)
-			@subtitle = (subtitle || '').sub(/^# /,"\##{categories_to_string} ")
-			@strip_subtitle = strip_subtitle
-		end
+	module Style
+		class GfmSection
+			include BaseSection
+			include Twitter::Autolink
+
+			def initialize(fragment, author = nil)
+				@author = author
+				@subtitle, @body = fragment.split(/\n/, 2)
+				@subtitle.sub!(/^\#\s*/,'')
+				@body ||= ''
+
+				@categories = get_categories
+				@stripped_subtitle = strip_subtitle
+
+				@subtitle_to_html = @subtitle ? to_html('# ' + @subtitle).gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
+				@stripped_subtitle_to_html = @stripped_subtitle ? to_html('# ' + @stripped_subtitle).gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
+				@body_to_html = to_html(@body)
+			end
 
-		def categories=(categories)
-			@subtitle = "#{categories_to_string} " + (strip_subtitle || '')
-			@strip_subtitle = strip_subtitle
-		end
+			def subtitle=(subtitle)
+				@subtitle = (subtitle || '').sub(/^# /,"\##{categories_to_string} ")
+				@strip_subtitle = strip_subtitle
+			end
 
-		def to_src
-			r = ''
-			r << "\# #{@subtitle}\n" if @subtitle
-			r << @body
-		end
+			def categories=(categories)
+				@subtitle = "#{categories_to_string} " + (strip_subtitle || '')
+				@strip_subtitle = strip_subtitle
+			end
 
-		def do_html4(date, idx, opt)
-			subtitle = to_html('# ' + @subtitle)
-			subtitle.sub!( %r!<h3>(.+?)</h3>!m ) do
-				"<h3><%= subtitle_proc( Time.at( #{date.to_i} ), #{$1.dump.gsub( /%/, '\\\\045' )} ) %></h3>"
+			def to_src
+				r = ''
+				r << "\# #{@subtitle}\n" if @subtitle
+				r << @body
 			end
-			if opt['multi_user'] and @author then
-				subtitle.sub!(/<\/h3>/,%Q|[#{@author}]</h3>|)
+
+			def do_html4(date, idx, opt)
+				subtitle = to_html('# ' + @subtitle)
+				subtitle.sub!( %r!<h3>(.+?)</h3>!m ) do
+					"<h3><%= subtitle_proc( Time.at( #{date.to_i} ), #{$1.dump.gsub( /%/, '\\\\045' )} ) %></h3>"
+				end
+				if opt['multi_user'] and @author then
+					subtitle.sub!(/<\/h3>/,%Q|[#{@author}]</h3>|)
+				end
+				r = subtitle
+				r << @body_to_html
 			end
-			r = subtitle
-			r << @body_to_html
-		end
 
-	private
+			private
 
-		def to_html(string)
-			renderer = HTMLwithPygments.new(:hard_wrap => true)
-			extensions = {:fenced_code_blocks => true, :tables => true, :no_intra_emphasis => true}
-			r = Redcarpet::Markdown.new(renderer, extensions).render(string)
+			def to_html(string)
+				renderer = HTMLwithPygments.new(:hard_wrap => true)
+				extensions = {:fenced_code_blocks => true, :tables => true, :no_intra_emphasis => true}
+				r = Redcarpet::Markdown.new(renderer, extensions).render(string)
 
-			# Twitter Autolink
-			r = auto_link(r)
+				# Twitter Autolink
+				r = auto_link(r)
 
-			if r =~ /(<pre>|<code>)/
-				r.gsub!(/<a class=\"tweet-url username\" href=\".*?\">(.*?)<\/a>/){ $1 }
-			end
+				if r =~ /(<pre>|<code>)/
+					r.gsub!(/<a class=\"tweet-url username\" href=\".*?\">(.*?)<\/a>/){ $1 }
+				end
 
-			# except url autolink in plugin block
-			if r =~ /\{\{.+?\}\}/
-				r.gsub!(/<a href=\"(.*?)\" rel=\"nofollow\">.*?<\/a>/){ $1 }
-				r.gsub!(/\{\{(.+?)\}\}/) { "<%=#{CGI.unescapeHTML($1).gsub(/&#39;/, "'").gsub(/&quot;/, '"')}%>" }
-			end
+				# except url autolink in plugin block
+				if r =~ /\{\{.+?\}\}/
+					r.gsub!(/<a href=\"(.*?)\" rel=\"nofollow\">.*?<\/a>/){ $1 }
+					r.gsub!(/\{\{(.+?)\}\}/) { "<%=#{CGI.unescapeHTML($1).gsub(/&#39;/, "'").gsub(/&quot;/, '"')}%>" }
+				end
 
-			# ignore duplicate autolink
-			if r =~ /<a href="<a href="/
-				r.gsub!(/<a href="<a href=".*?" rel="nofollow">(.*?)<\/a>"(.*?)>(.*?)<\/a>/) do
-          "<a href=\"#{$1}\" rel=\"nofollow\"#{$2}>#{$3}</a>"
-        end
-			end
-      # ignore auto imagelink
-			if r =~ /<img src="<a href="/
-				r.gsub!(/<img src="<a href=".*?" rel="nofollow">(.*?)<\/a>"(?: alt="(.*?)")?>/){ "<img src=\"#{$1}\" alt=\"#{$2}\">" }
-			end
+				# ignore duplicate autolink
+				if r =~ /<a href="<a href="/
+					r.gsub!(/<a href="<a href=".*?" rel="nofollow">(.*?)<\/a>"(.*?)>(.*?)<\/a>/) do
+						"<a href=\"#{$1}\" rel=\"nofollow\"#{$2}>#{$3}</a>"
+					end
+				end
+				# ignore auto imagelink
+				if r =~ /<img src="<a href="/
+					r.gsub!(/<img src="<a href=".*?" rel="nofollow">(.*?)<\/a>"(?: alt="(.*?)")?>/){ "<img src=\"#{$1}\" alt=\"#{$2}\">" }
+				end
 
-			# emoji
-			r = r.emojify
+				# emoji
+				r = r.emojify
 
-			# diary anchor
-			r.gsub!(/<h(\d)/) { "<h#{$1.to_i + 2}" }
-			r.gsub!(/<\/h(\d)/) { "</h#{$1.to_i + 2}" }
+				# diary anchor
+				r.gsub!(/<h(\d)/) { "<h#{$1.to_i + 2}" }
+				r.gsub!(/<\/h(\d)/) { "</h#{$1.to_i + 2}" }
 
-			# my syntax
-			r.gsub!(/\((.*?)\)\[(\d{4}|\d{6}|\d{8}|\d{8}-\d+)[^\d]*?#?([pct]\d+)?\]/) {
-				unless $1.empty?
-					%Q|<%=my "#{$2}#{$3}", "#{$1}" %>|
-				else
-					%Q|<%=my "#{$2}#{$3}", "#{$2}#{$3}" %>|
-				end
-			}
+				# my syntax
+				r.gsub!(/\((.*?)\)\[(\d{4}|\d{6}|\d{8}|\d{8}-\d+)[^\d]*?#?([pct]\d+)?\]/) {
+					unless $1.empty?
+						%Q|<%=my "#{$2}#{$3}", "#{$1}" %>|
+					else
+						%Q|<%=my "#{$2}#{$3}", "#{$2}#{$3}" %>|
+					end
+				}
 
-			r
-		end
+				r
+			end
 
-		def get_categories
-			return [] unless @subtitle
-			cat = /(\\?\[([^\[]+?)\\?\])+/.match(@subtitle).to_a[0]
-			return [] unless cat
-			cat.scan(/\\?\[(.*?)\\?\]/).collect do |c|
-				c[0].split(/,/)
-			end.flatten
-		end
+			def get_categories
+				return [] unless @subtitle
+				cat = /(\\?\[([^\[]+?)\\?\])+/.match(@subtitle).to_a[0]
+				return [] unless cat
+				cat.scan(/\\?\[(.*?)\\?\]/).collect do |c|
+					c[0].split(/,/)
+				end.flatten
+			end
 
-		def strip_subtitle
-			return nil unless @subtitle
-			r = @subtitle.sub(/^((\\?\[[^\[]+?\]\\?)+\s+)?/, '')
-			if r.empty?
-				nil
-			else
-				r
+			def strip_subtitle
+				return nil unless @subtitle
+				r = @subtitle.sub(/^((\\?\[[^\[]+?\]\\?)+\s+)?/, '')
+				if r.empty?
+					nil
+				else
+					r
+				end
 			end
 		end
-	end
 
-	class GfmDiary
-		include DiaryBase
-		include CategorizableDiary
+		class GfmDiary
+			include BaseDiary
+			include CategorizableDiary
 
-		def initialize(date, title, body, modified = Time.now)
-			init_diary
-			replace( date, title, body )
-			@last_modified = modified
-		end
+			def initialize(date, title, body, modified = Time.now)
+				init_diary
+				replace( date, title, body )
+				@last_modified = modified
+			end
 
-		def style
-			'GFM'
-		end
+			def style
+				'GFM'
+			end
 
-		def append(body, author = nil)
-			section = nil
-			body.each_line do |l|
-				case l
-				when /^\#[^\#]/
-					@sections << GfmSection.new(section, author) if section
-					section = l
-				else
-					section = '' unless section
-					section << l
+			def append(body, author = nil)
+				section = nil
+				body.each_line do |l|
+					case l
+					when /^\#[^\#]/
+						@sections << GfmSection.new(section, author) if section
+						section = l
+					else
+						section = '' unless section
+						section << l
+					end
 				end
+				if section
+					section << "\n" unless section =~ /\n\n\z/
+					@sections << GfmSection.new(section, author)
+				end
+				@last_modified = Time.now
+				self
 			end
-			if section
-				section << "\n" unless section =~ /\n\n\z/
-				@sections << GfmSection.new(section, author)
-			end
-			@last_modified = Time.now
-			self
-		end
 
-		def add_section(subtitle, body)
-			@sections = GfmSection.new("\# #{subtitle}\n\n#{body}")
-			@sections.size
+			def add_section(subtitle, body)
+				@sections = GfmSection.new("\# #{subtitle}\n\n#{body}")
+				@sections.size
+			end
 		end
 	end
 end

data/misc/style/rd/rd_style.rb

@@ -55,11 +55,11 @@ module RD
 
 		def apply_to_DescListItem(element, term, description)
 			%Q[<dt>#{term.join}</dt>] +
-			if description.empty? then
-				"\n"
-			else
-				%Q[\n<dd>\n#{description.join("\n").chomp}\n</dd>]
-			end
+				if description.empty? then
+					"\n"
+				else
+					%Q[\n<dd>\n#{description.join("\n").chomp}\n</dd>]
+				end
 		end
 
 		def apply_to_MethodList(element, items)
@@ -129,7 +129,7 @@ module RD
 
 			if cat
 				r =
-				cat.scan(/\[(.*?)\]/).collect do |c|
+					cat.scan(/\[(.*?)\]/).collect do |c|
 			  		%Q|<%= category_anchor("#{c[0]}") %>|
 				end.join + subtitle
 			else
@@ -187,173 +187,175 @@ MSG
 end
 
 module TDiary
-	class RDSection
-		include RD
-
-		attr_reader :author, :categories, :subtitle, :stripped_subtitle
-		attr_reader :body_to_html, :subtitle_to_html, :stripped_subtitle_to_html
-	
-		def initialize( fragment, author = nil )
-			@author = author
-			if /\A=(?!=)/ =~ fragment then
-				@subtitle, @body = fragment.split( /\n/, 2 )
-				@subtitle.sub!( /^\=\s*/, '' )
-			else
-				@subtitle = nil
-				@body = fragment.dup
+	module Style
+		class RDSection
+			include RD
+
+			attr_reader :author, :categories, :subtitle, :stripped_subtitle
+			attr_reader :body_to_html, :subtitle_to_html, :stripped_subtitle_to_html
+			
+			def initialize( fragment, author = nil )
+				@author = author
+				if /\A=(?!=)/ =~ fragment then
+					@subtitle, @body = fragment.split( /\n/, 2 )
+					@subtitle.sub!( /^\=\s*/, '' )
+				else
+					@subtitle = nil
+					@body = fragment.dup
+				end
+				@body = @body || ''
+				@body.sub!( /[\n\r]+\Z/, '' )
+				@body << "\n\n"
+
+				@categories = get_categories
+				@stripped_subtitle = strip_subtitle
+
+				@subtitle_to_html = manufacture(@subtitle, true)
+				@stripped_subtitle_to_html = manufacture(@stripped_subtitle, true)
+				@body_to_html = manufacture(@body, false)
+			end
+			
+			def subtitle=(subtitle)
+				cat_str = ""
+				@categories.each {|cat|
+					cat_str << "[#{cat}]"
+				}
+				cat_str << " " unless cat_str.empty?
+				@subtitle = subtitle ? (cat_str + subtitle) : nil
+				@stripped_subtitle = strip_subtitle
+			end
+			
+			def body=(str)
+				@body = str
+			end
+			
+			def body
+				@body.dup
+			end
+			
+			def categories=(categories)
+				@categories = categories
+				cat_str = ""
+				categories.each {|cat|
+					cat_str << "[#{cat}]"
+				}
+				cat_str << " " unless cat_str.empty?
+				@subtitle = @subtitle ? (cat_str + @stripped_subtitle) : nil
+				@stripped_subtitle = strip_subtitle
 			end
-			@body = @body || ''
-			@body.sub!( /[\n\r]+\Z/, '' )
-			@body << "\n\n"
 
-			@categories = get_categories
-			@stripped_subtitle = strip_subtitle
+			def to_src
+				r = ''
+				r << "= #{@subtitle}\n" if @subtitle
+				r << @body
+			end
 
-			@subtitle_to_html = manufacture(@subtitle, true)
-			@stripped_subtitle_to_html = manufacture(@stripped_subtitle, true)
-			@body_to_html = manufacture(@body, false)
-		end
-	
-		def subtitle=(subtitle)
-			cat_str = ""
-			@categories.each {|cat|
-				cat_str << "[#{cat}]"
-			}
-			cat_str << " " unless cat_str.empty?
-			@subtitle = subtitle ? (cat_str + subtitle) : nil
-			@stripped_subtitle = strip_subtitle
-		end
-	
-		def body=(str)
-			@body = str
-		end
-	
-		def body
-		  	@body.dup
-		end
-	
-		def categories=(categories)
-			@categories = categories
-			cat_str = ""
-			categories.each {|cat|
-				cat_str << "[#{cat}]"
-			}
-			cat_str << " " unless cat_str.empty?
-			@subtitle = @subtitle ? (cat_str + @stripped_subtitle) : nil
-			@stripped_subtitle = strip_subtitle
-		end
+			def html( date, idx, opt, mode = :HTML)
+				if mode == :CHTML
+					visitor = RD2tDiaryCHTMLVistor.new( date, idx, opt, @author)
+					section_open = "<%=section_enter_proc( Time::at( #{date.to_i} ))%>\n"
+					section_close = "<%=section_leave_proc( Time::at( #{date.to_i} ))%>\n"
+				else
+					visitor = RD2tDiaryVisitor.new( date, idx, opt, @author )
+					section_open = %Q[<div class="section">\n<%=section_enter_proc( Time::at( #{date.to_i} ))%>\n]
+					section_close = "<%=section_leave_proc( Time::at( #{date.to_i} ))%>\n</div>\n"
+				end
 
-		def to_src
-			r = ''
-			r << "= #{@subtitle}\n" if @subtitle
-			r << @body
-		end
+				src = to_src.split(/^/)
+				src.unshift("=begin\n").push("=end\n")
+				tree = RDTree.new( src, nil, nil)
+				begin
+					tree.parse
+				rescue ParseError
+					raise SyntaxError, $!.message
+				end
 
-		def html( date, idx, opt, mode = :HTML)
-			if mode == :CHTML
-				visitor = RD2tDiaryCHTMLVistor.new( date, idx, opt, @author)
-				section_open = "<%=section_enter_proc( Time::at( #{date.to_i} ))%>\n"
-				section_close = "<%=section_leave_proc( Time::at( #{date.to_i} ))%>\n"
-			else
-				visitor = RD2tDiaryVisitor.new( date, idx, opt, @author )
-				section_open = %Q[<div class="section">\n<%=section_enter_proc( Time::at( #{date.to_i} ))%>\n]
-				section_close = "<%=section_leave_proc( Time::at( #{date.to_i} ))%>\n</div>\n"
+				r = "#{section_open}#{visitor.visit( tree )}#{section_close}"
 			end
 
-			src = to_src.split(/^/)
-			src.unshift("=begin\n").push("=end\n")
-			tree = RDTree.new( src, nil, nil)
-			begin
-				tree.parse
-			rescue ParseError
-				raise SyntaxError, $!.message
+			private
+			def manufacture(str, subtitle = false)
+				return nil unless str
+				src = str.strip.split(/^/).unshift("=begin\n").push("=end\n")
+				visitor = RD2tDiaryVisitor.new
+				tree = RDTree.new(src, nil, nil)
+				begin
+					r = visitor.visit( tree.parse )
+					r.gsub!(/<\/?p>/, '') if subtitle
+					r
+				rescue ParseError
+					str
+				end
 			end
 
-			r = "#{section_open}#{visitor.visit( tree )}#{section_close}"
-		end
-
-		private
-		def manufacture(str, subtitle = false)
-			return nil unless str
-			src = str.strip.split(/^/).unshift("=begin\n").push("=end\n")
-			visitor = RD2tDiaryVisitor.new
-			tree = RDTree.new(src, nil, nil)
-			begin
-				r = visitor.visit( tree.parse )
-				r.gsub!(/<\/?p>/, '') if subtitle
-				r
-			rescue ParseError
-				str
+			def get_categories
+				return [] unless @subtitle
+				cat = /^(\[(.*?)\])+/.match(@subtitle).to_a[0]
+				return [] unless cat
+				cat.scan(/\[(.*?)\]/).collect do |c|
+					c[0].split(/,/)
+				end.flatten
 			end
-		end
-
-		def get_categories
-			return [] unless @subtitle
-			cat = /^(\[(.*?)\])+/.match(@subtitle).to_a[0]
-			return [] unless cat
-			cat.scan(/\[(.*?)\]/).collect do |c|
-				c[0].split(/,/)
-			end.flatten
-		end
 
-		def strip_subtitle
-			return nil unless @subtitle
-			@subtitle.sub(/^(\[(.*?)\])+/,'')
+			def strip_subtitle
+				return nil unless @subtitle
+				@subtitle.sub(/^(\[(.*?)\])+/,'')
+			end
 		end
-	end
 
-	class RdDiary
-		include DiaryBase
-		include CategorizableDiary
-	
-		def initialize( date, title, body, modified = Time::now )
-			init_diary
-			replace( date, title, body )
-			@last_modified = modified
-		end
-	
-		def style
-			'RD'
-		end
-	
-		def append( body, author = nil )
-			section = nil
-			body.lines.each do |l|
-				case l
-				when /^=(begin|end)\b/
-				  	# do nothing
-				when /^=[^=]/
-				  	@sections << RDSection::new( section, author ) if section
-					section = l
-				else
-					section = '' unless section
-					section << l
+		class RdDiary
+			include BaseDiary
+			include CategorizableDiary
+			
+			def initialize( date, title, body, modified = Time::now )
+				init_diary
+				replace( date, title, body )
+				@last_modified = modified
+			end
+			
+			def style
+				'RD'
+			end
+			
+			def append( body, author = nil )
+				section = nil
+				body.lines.each do |l|
+					case l
+					when /^=(begin|end)\b/
+						# do nothing
+					when /^=[^=]/
+						@sections << RDSection::new( section, author ) if section
+						section = l
+					else
+						section = '' unless section
+						section << l
+					end
 				end
+				@sections << RDSection::new( section, author ) if section
+				@last_modified = Time::now
+				self
 			end
-			@sections << RDSection::new( section, author ) if section
-			@last_modified = Time::now
-			self
-		end
-	
-		def add_section(subtitle, body)
-			sec = RDSection::new("\n")
-			sec.subtitle = subtitle
-			sec.body     = body
-			@sections << sec
-			@sections.size
-		end
-	
-		def to_html( opt = {}, mode = :HTML )
-			r = ''
-			idx = 1
-			each_section do |section|
-				r << section.html( date, idx, opt, mode )
-				idx += 1
+			
+			def add_section(subtitle, body)
+				sec = RDSection::new("\n")
+				sec.subtitle = subtitle
+				sec.body     = body
+				@sections << sec
+				@sections.size
+			end
+			
+			def to_html( opt = {}, mode = :HTML )
+				r = ''
+				idx = 1
+				each_section do |section|
+					r << section.html( date, idx, opt, mode )
+					idx += 1
+				end
+				return r
 			end
-			return r
-		end
 
-		undef :to_html4, :to_chtml
+			undef :to_html4, :to_chtml
+		end
 	end
 end
 
@@ -363,4 +365,3 @@ end
 # tab-width: 3
 # ruby-indent-level: 3
 # End:
-