RubyGems - omf_web - Versions diffs - 0.9.9 → 1.0.0 - Mend

omf_web 0.9.9 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (64) hide show

checksums.yaml +7 -0
data/README.md +31 -0
data/bin/omf_web_server.rb +157 -0
data/doc/screenshot2.png +0 -0
data/doc/widget_detail.png +0 -0
data/example/demo/data_sources/downloads.rb +2 -1
data/example/simple/README.md +12 -13
data/example/simple/create_waveform.rb +29 -0
data/example/simple/introduction.md +17 -0
data/example/simple/sample.sq3 +0 -0
data/example/simple/sample.sql +1008 -0
data/example/simple/simple.yaml +62 -0
data/example/simple/simple_dynamic.yaml +66 -0
data/lib/irods4r/file.rb +15 -14
data/lib/irods4r/icommands.rb +18 -18
data/lib/irods4r.rb +9 -9
data/lib/omf-web/config.ru +41 -16
data/lib/omf-web/content/git_repository.rb +32 -31
data/lib/omf-web/content/irods_repository.rb +34 -33
data/lib/omf-web/content/repository.rb +48 -44
data/lib/omf-web/data_source_proxy.rb +33 -22
data/lib/omf-web/rack/session_authenticator.rb +48 -12
data/lib/omf-web/rack/tab_mapper.rb +30 -36
data/lib/omf-web/rack/websocket_handler.rb +26 -25
data/lib/omf-web/session_store.rb +16 -13
data/lib/omf-web/theme/abstract_page.rb +26 -22
data/lib/omf-web/theme/bright/page.rb +84 -34
data/lib/omf-web/theme/bright/stacked_renderer.rb +20 -19
data/lib/omf-web/theme.rb +14 -9
data/lib/omf-web/thin/runner.rb +38 -36
data/lib/omf-web/thin/server.rb +255 -0
data/lib/omf-web/version.rb +1 -1
data/lib/omf-web/widget/data_widget.rb +6 -6
data/lib/omf-web/widget/text/maruku/helpers.rb +33 -30
data/lib/omf-web/widget/text/maruku/input/parse_block.rb +117 -117
data/lib/omf-web/widget/text/maruku/output/to_html.rb +155 -154
data/lib/omf-web/widget/text/maruku.rb +17 -16
data/omf_web.gemspec +6 -2
data/sample.sq3 +0 -0
data/share/htdocs/graph/js/gauge.js +524 -0
data/share/htdocs/vendor/VERSION_MAP.yaml +3 -3
data/share/htdocs/vendor/backbone-1.0.0/backbone.js +1571 -0
data/share/htdocs/vendor/d3-3.0/LICENSE.brewer.txt +38 -0
data/share/htdocs/vendor/d3-3.0/colorbrewer.js +1 -0
data/share/htdocs/vendor/d3-3.0/d3.js +8810 -0
data/share/htdocs/vendor/d3-3.0/d3.min.js +5 -0
data/share/htdocs/vendor/geo_json/Readme.txt +71 -0
data/share/htdocs/vendor/geo_json/regions.json +41 -0
data/share/htdocs/vendor/geo_json/switzerland.json +24 -0
data/share/htdocs/vendor/geo_json/world.json +497 -0
data/share/htdocs/vendor/nv_d3/js/nv.d3.js +8801 -4447
data/share/htdocs/vendor/spin/jquery.spin.js +46 -0
data/share/htdocs/vendor/spin/spin.js +349 -0
data/share/htdocs/vendor/spin/spin.min.js +1 -0
data/share/htdocs/vendor/underscore-1.4.4/underscore.js +1227 -0
metadata +63 -48
data/example/simple/data_sources/gimi31.sq3 +0 -0
data/example/simple/data_sources/ping_source.rb +0 -56
data/example/simple/simple_viz_server.rb +0 -39
data/example/simple/widgets/charts_tab.yaml +0 -38
data/share/.DS_Store +0 -0
data/share/htdocs/.DS_Store +0 -0
data/share/htdocs/vendor/backbone-0.5.3/backbone.js +0 -1158
data/share/htdocs/vendor/underscore-1.2.1/underscore.js +0 -958

data/lib/omf-web/widget/text/maruku/output/to_html.rb CHANGED Viewed

@@ -2,17 +2,17 @@
 #   Copyright (C) 2006  Andrea Censi  <andrea (at) rubyforge.org>
 #
 # This file is part of Maruku.
-#
+#
 #   Maruku is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
-#
+#
 #   Maruku is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
-#
+#
 #   You should have received a copy of the GNU General Public License
 #   along with Maruku; if not, write to the Free Software
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -25,7 +25,7 @@ begin
 	require 'rexml/formatters/default'
 	$rexml_new_version = true
 rescue LoadError
-	$rexml_new_version = false
+	$rexml_new_version = false
 end
 class String
@@ -40,13 +40,13 @@ end
 # This module groups all functions related to HTML export.
 module MaRuKu; module Out; module HTML
 	include REXML
 	# Render as an HTML fragment (no head, just the content of BODY). (returns a string)
 	def to_html(context={})
 	  Thread.current['maruku_context'] = context
 		indent = context[:indent] || -1
 		ie_hack = context[:ie_hack] || true
 		div = Element.new 'dummy'
 			children_to_html.each do |e|
 				div << e
@@ -56,10 +56,10 @@ module MaRuKu; module Out; module HTML
 			if @doc.footnotes_order.size > 0
 				div << render_footnotes
 			end
 		doc = Document.new(nil,{:respect_whitespace =>:all})
 		doc << div
 		# REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements
 		# containing code.
 		xml =""
@@ -80,45 +80,45 @@ module MaRuKu; module Out; module HTML
 		xml.gsub!(/\A<dummy\s*\/>/,'')
 		xml
 	end
 	# Render to a complete HTML document (returns a string)
 	def to_html_document(context={})
 		indent = context[:indent] || -1
 		ie_hack = context[:ie_hack] ||true
 		doc = to_html_document_tree
-		xml  = ""
+		xml  = ""
 		# REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements
 		# containing code.
 		doc.write(xml,indent,transitive=true,ie_hack);
 		Xhtml11_mathml2_svg11 + xml
 	end
-	unless defined? Xhtml10strict
-  		Xhtml10strict  =
+	unless defined? Xhtml10strict
+  		Xhtml10strict  =
   "<?xml version='1.0' encoding='utf-8'?>
   <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
   'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>\n"
   	Xhtml11strict_mathml2 = '<?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
                  "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd" [
     <!ENTITY mathml "http://www.w3.org/1998/Math/MathML">
   ]>
   '
-  Xhtml11_mathml2_svg11 =
+  Xhtml11_mathml2_svg11 =
   '<?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE html PUBLIC
       "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"
       "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">
   '
   end
 	def xml_newline() Text.new("\n") end
 =begin maruku_doc
 Attribute: title
@@ -198,22 +198,22 @@ Example:
 	def to_html_document_tree
 		doc = Document.new(nil,{:respect_whitespace =>:all})
 	#	doc << XMLDecl.new
 		root = Element.new('html', doc)
 		root.add_namespace('http://www.w3.org/1999/xhtml')
 		root.add_namespace('svg', "http://www.w3.org/2000/svg" )
 		lang = self.attributes[:lang] || 'en'
 		root.attributes['xml:lang'] = lang
 		root << xml_newline
 		head = Element.new 'head', root
 			#<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
 			me = Element.new 'meta', head
 			me.attributes['http-equiv'] = 'Content-type'
-#			me.attributes['content'] = 'text/html;charset=utf-8'
-			me.attributes['content'] = 'application/xhtml+xml;charset=utf-8'
+#			me.attributes['content'] = 'text/html;charset=utf-8'
+			me.attributes['content'] = 'application/xhtml+xml;charset=utf-8'
 			METAS.each do |m|
 				if value = self.attributes[m.to_sym]
 					meta = Element.new 'meta', head
@@ -221,8 +221,8 @@ Example:
 					meta.attributes['content'] = value.to_s
 				end
 			end
 			self.attributes.each do |k,v|
 				if k.to_s =~ /\Ameta-(.*)\Z/
 					meta = Element.new 'meta', head
@@ -230,21 +230,21 @@ Example:
 					meta.attributes['content'] = v.to_s
 				end
 			end
 			# Create title element
 			doc_title = self.attributes[:title] || self.attributes[:subject] || ""
 			title = Element.new 'title', head
 				title << Text.new(doc_title)
 			add_css_to(head)
 		root << xml_newline
 		body = Element.new 'body'
 			children_to_html.each do |e|
 				body << e
 			end
@@ -253,15 +253,15 @@ Example:
 			if @doc.footnotes_order.size > 0
 				body << render_footnotes
 			end
-			# When we are rendering a whole document, we add a signature
-			# at the bottom.
+			# When we are rendering a whole document, we add a signature
+			# at the bottom.
 			if get_setting(:maruku_signature)
-				body << maruku_html_signature
+				body << maruku_html_signature
 			end
 		root << body
 		doc
 	end
@@ -273,12 +273,12 @@ Example:
 			link.attributes['type'] = 'text/css'
 			link.attributes['rel'] = 'stylesheet'
 			link.attributes['href'] = css
-			head << link
+			head << link
 			head << xml_newline
 			end
 		end
 	end
 	# returns "st","nd","rd" or "th" as appropriate
 	def day_suffix(day)
 		s = {
@@ -301,8 +301,8 @@ Example:
 		day_suffix(t.day)+
 		t.strftime(", %Y")
 	end
-	def maruku_html_signature
+	def maruku_html_signature
 		div = Element.new 'div'
 			div.attributes['class'] = 'maruku_signature'
 			Element.new 'hr', div
@@ -316,7 +316,7 @@ Example:
 				span << Text.new(nice_date+".")
 		div
 	end
 	def render_footnotes()
 		div = Element.new 'div'
 		div.attributes['class'] = 'footnotes'
@@ -327,7 +327,7 @@ Example:
 				if f
 					li = f.wrap_as_element('li')
 					li.attributes['id'] = "#{get_setting(:doc_prefix)}fn:#{num}"
 					a = Element.new 'a'
 						a.attributes['href'] = "\##{get_setting(:doc_prefix)}fnref:#{num}"
 						a.attributes['rev'] = 'footnote'
@@ -348,17 +348,17 @@ Example:
 	def to_html_linebreak; Element.new 'br' end
 	# renders children as html and wraps into an element of given name
-	#
+	#
 	# Sets 'id' if meta is set
 	def wrap_as_element(name, attributes_to_copy=[])
 		m = create_html_element(name, attributes_to_copy)
 			children_to_html.each do |e| m << e; end
 #			m << Comment.new( "{"+self.al.to_md+"}") if not self.al.empty?
 #			m << Comment.new( @attributes.inspect) if not @attributes.empty?
 		m
 	end
 =begin maruku_doc
 Attribute: id
 Scope: element
@@ -386,21 +386,21 @@ Output: HTML
 It is copied as a standard HTML attribute.
 =end
 	unless defined? HTML4Attributes
 	  HTML4Attributes = {}
 	end
 	coreattrs = [:id, :class, :style, :title]
 	i18n = [:lang, 'xml:lang'.to_sym]
 	events = [
-		:onclick, :ondblclick, :onmousedown, :onmouseup, :onmouseover,
+		:onclick, :ondblclick, :onmousedown, :onmouseup, :onmouseover,
 		:onmousemove, :onmouseout,
-		:onkeypress, :onkeydown, :onkeyup]
+		:onkeypress, :onkeydown, :onkeyup]
 	attrs = coreattrs + i18n + events
 	cellhalign = [:align, :char, :charoff]
 	cellvalign = [:valign]
@@ -408,32 +408,32 @@ It is copied as a standard HTML attribute.
 		['body', attrs + [:onload, :onunload]],
 		['address', attrs],
 		['div', attrs],
-		['a', attrs+[:charset, :type, :name, :rel, :rev, :accesskey, :shape, :coords, :tabindex,
+		['a', attrs+[:charset, :type, :name, :rel, :rev, :accesskey, :shape, :coords, :tabindex,
 			:onfocus,:onblur]],
 		['img', attrs + [:longdesc, :name, :height, :width, :alt] ],
 		['p', attrs],
-		[['h1','h2','h3','h4','h5','h6'], attrs],
+		[['h1','h2','h3','h4','h5','h6'], attrs],
 		[['pre'], attrs],
 		[['q', 'blockquote'], attrs+[:cite]],
 		[['ins','del'], attrs+[:cite,:datetime]],
 		[['ol','ul','li'], attrs],
 		['table',attrs+[:summary, :width, :frame, :rules, :border, :cellspacing, :cellpadding]],
-		['caption',attrs],
+		['caption',attrs],
 		[['colgroup','col'],attrs+[:span, :width]+cellhalign+cellvalign],
 		[['thead','tbody','tfoot'], attrs+cellhalign+cellvalign],
 		[['td','td','th'], attrs+[:abbr, :axis, :headers, :scope, :rowspan, :colspan, :cellvalign, :cellhalign]],
 		# altri
 		[['em','code','strong','hr','span','dl','dd','dt'], attrs]
 	].each do |el, a| [*el].each do |e| HTML4Attributes[e] = a end end
 	def create_html_element(name, attributes_to_copy=[])
 		m = Element.new name
-			if atts = HTML4Attributes[name] then
+			if atts = HTML4Attributes[name] then
 				atts.each do |att|
-					if v = @attributes[att] then
-						m.attributes[att.to_s] = v.to_s
+					if v = @attributes[att] then
+						m.attributes[att.to_s] = v.to_s
 					end
 				end
 			else
@@ -442,24 +442,24 @@ It is copied as a standard HTML attribute.
 		m
 	end
 	def to_html_ul
 		if @attributes[:toc]
 			# render toc
 			html_toc = @doc.toc.to_html
 			return html_toc
 		else
-			add_ws  wrap_as_element('ul')
+			add_ws  wrap_as_element('ul')
 		end
 	end
 	def to_html_paragraph
 	  #add_ws wrap_as_element('p')
 	  dt = Element.new 'p'
     dt.attributes['class'] = 'drop-target'
     dt.attributes['line_no'] = Thread.current['line_no']
-    dt.attributes['delegate'] = 'plan'  # should most likely go into the js column handler
+    dt.attributes['delegate'] = 'plan'  # should most likely go into the js column handler
 	  p = wrap_as_element('p')
 	  p.attributes['class'] = 'content'
 	  [Text.new("\n"), p, dt, Text.new("\n")]
@@ -485,7 +485,7 @@ by Maruku, to have the same results in both HTML and LaTeX.
 	# nil if not applicable, else string
 	def section_number
 		return nil if not get_setting(:use_numbered_headers)
 		n = @attributes[:section_number]
 		if n && (not n.empty?)
 			 n.join('.')+". "
@@ -493,7 +493,7 @@ by Maruku, to have the same results in both HTML and LaTeX.
 			nil
 		end
 	end
 	# nil if not applicable, else SPAN element
 	def render_section_number
 		# if we are bound to a section, add section number
@@ -506,11 +506,11 @@ by Maruku, to have the same results in both HTML and LaTeX.
 			nil
 		end
 	end
 	def to_html_header_orig
-		element_name = "h#{self.level}"
+		element_name = "h#{self.level}"
 		h = wrap_as_element element_name
 		if span = render_section_number
 			h.insert_before(h.children.first, span)
 		end
@@ -518,9 +518,9 @@ by Maruku, to have the same results in both HTML and LaTeX.
 	end
 	def to_html_header
-		element_name = "h#{self.level}"
+		element_name = "h#{self.level}"
 		h = wrap_as_element element_name
 		if span = render_section_number
 			h.insert_before(h.children.first, span)
 		end
@@ -535,7 +535,7 @@ by Maruku, to have the same results in both HTML and LaTeX.
 		source = source.gsub(/'/,'&#39;') # IE bug
 		Text.new(source, true, nil, true )
 	end
 =begin maruku_doc
 Attribute: html_use_syntax
 Scope: global, document, element
@@ -552,8 +552,8 @@ Examples:
 		require 'maruku'
 	{:lang=ruby html_use_syntax=true}
-and
+and
 		<div style="text-align:center">Div</div>
 	{:lang=html html_use_syntax=true}
@@ -570,16 +570,16 @@ and
 =end
 	$syntax_loaded = false
-	def to_html_code;
+	def to_html_code;
 		source = self.raw_code
-		lang = self.attributes[:lang] || @doc.attributes[:code_lang]
+		lang = self.attributes[:lang] || @doc.attributes[:code_lang]
 		lang = 'xml' if lang=='html'
 		use_syntax = get_setting :html_use_syntax
-		element =
+		element =
 		if use_syntax && lang
 			begin
 				if not $syntax_loaded
@@ -589,78 +589,78 @@ and
 					$syntax_loaded = true
 				end
 				convertor = Syntax::Convertors::HTML.for_syntax lang
 				# eliminate trailing newlines otherwise Syntax crashes
 				source = source.gsub(/\n*\Z/,'')
 				html = convertor.convert( source )
 				html = html.gsub(/\&apos;/,'&#39;') # IE bug
 				html = html.gsub(/'/,'&#39;') # IE bug
-	#			html = html.gsub(/&/,'&amp;')
+	#			html = html.gsub(/&/,'&amp;')
 				code = Document.new(html, {:respect_whitespace =>:all}).root
 				code.name = 'code'
 				code.attributes['class'] = lang
 				code.attributes['lang'] = lang
 				pre = Element.new 'pre'
 				pre << code
 				pre
 			rescue LoadError => e
 				maruku_error "Could not load package 'syntax'.\n"+
 					"Please install it, for example using 'gem install syntax'."
-				to_html_code_using_pre(source)
+				to_html_code_using_pre(source)
 			rescue Object => e
 				maruku_error"Error while using the syntax library for code:\n#{source.inspect}"+
 				 "Lang is #{lang} object is: \n"+
-				  self.inspect +
+				  self.inspect +
 				"\nException: #{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
 				tell_user("Using normal PRE because the syntax library did not work.")
 				to_html_code_using_pre(source)
 			end
 		else
 			to_html_code_using_pre(source)
 		end
 		color = get_setting(:code_background_color)
 		if color != Globals[:code_background_color]
 			element.attributes['style'] = "background-color: #{color};"
 		end
 		add_ws element
 	end
 =begin maruku_doc
 Attribute: code_background_color
 Scope: global, document, element
 Summary: Background color for code blocks.
 The format is either a named color (`green`, `red`) or a CSS color
-of the form `#ff00ff`.
+of the form `#ff00ff`.
-* for **HTML output**, the value is put straight in the `background-color` CSS
+* for **HTML output**, the value is put straight in the `background-color` CSS
   property of the block.
 * for **LaTeX output**, if it is a named color, it must be a color accepted
   by the LaTeX `color` packages. If it is of the form `#ff00ff`, Maruku
-  defines a color using the `\color[rgb]{r,g,b}` macro.
+  defines a color using the `\color[rgb]{r,g,b}` macro.
   For example, for `#0000ff`, the macro is called as: `\color[rgb]{0,0,1}`.
 =end
 	def to_html_code_using_pre(source)
 		pre = create_html_element  'pre'
 		code = Element.new 'code', pre
 		s = source
 #		s  = s.gsub(/&/,'&amp;')
 		s = Text.normalize(s)
 		s  = s.gsub(/\&apos;/,'&#39;') # IE bug
 		s  = s.gsub(/'/,'&#39;') # IE bug
-		if get_setting(:code_show_spaces)
+		if get_setting(:code_show_spaces)
 			# 187 = raquo
 			# 160 = nbsp
 			# 172 = not
@@ -669,7 +669,7 @@ of the form `#ff00ff`.
 		end
 		text = Text.new(s, respect_ws=true, parent=nil, raw=true )
 		if lang = self.attributes[:lang]
 			code.attributes['lang'] = lang
 			code.attributes['class'] = lang
@@ -678,21 +678,21 @@ of the form `#ff00ff`.
 		pre
 	end
-	def to_html_inline_code;
+	def to_html_inline_code;
 		pre =  create_html_element 'code'
 			source = self.raw_code
-			pre << source2html(source)
+			pre << source2html(source)
 			color = get_setting(:code_background_color)
 			if color != Globals[:code_background_color]
 				pre.attributes['style'] = "background-color: #{color};"+(pre.attributes['style']||"")
 			end
 		pre
 	end
 	def add_class_to(el, cl)
-		el.attributes['class'] =
+		el.attributes['class'] =
 		if already = el.attributes['class']
 			already + " " + cl
 		else
@@ -702,10 +702,10 @@ of the form `#ff00ff`.
 	def add_class_to_link(a)
 		return # not ready yet
 		# url = a.attributes['href']
 		# return if not url
-		#
+		#
 		# if url =~ /^#/
 		# 	add_class_to(a, 'maruku-link-samedoc')
 		# elsif url =~ /^http:/
@@ -713,11 +713,11 @@ of the form `#ff00ff`.
 		# else
 		# 	add_class_to(a, 'maruku-link-local')
 		# end
-		#
+		#
 #		puts a.attributes['class']
 	end
 	def to_html_immediate_link
 		a =  create_html_element 'a'
 		url = self.url
@@ -727,11 +727,11 @@ of the form `#ff00ff`.
 		add_class_to_link(a)
 		a
 	end
 	def to_html_link
 		a =  wrap_as_element 'a'
 		id = self.ref_id
 		if ref = @doc.refs[id]
 			url = ref[:url]
 			title = ref[:title]
@@ -747,12 +747,13 @@ of the form `#ff00ff`.
 #		add_class_to_link(a)
 		return a
 	end
 	def to_html_im_link
 		if url = self.url
 			title = self.title
 			a =  wrap_as_element 'a'
 			a.attributes['href'] = url
+      a.attributes['xhref'] = url # BUG ALERT: Strange behaviour of jquery's replaceWith related to href
 			a.attributes['title'] = title if title
 			return a
 		else
@@ -761,12 +762,12 @@ of the form `#ff00ff`.
 			return wrap_as_element('span')
 		end
 	end
 	def add_ws(e)
 		[Text.new("\n"), e, Text.new("\n")]
 	end
 ##### Email address
 	def obfuscate(s)
 		res = ''
 		s.each_byte do |char|
@@ -774,7 +775,7 @@ of the form `#ff00ff`.
 		end
 		res
 	end
 	def to_html_email_address
 		email = self.email
 		a = create_html_element 'a'
@@ -783,7 +784,7 @@ of the form `#ff00ff`.
 			#"mailto:"+obfuscate(email),false,nil,true))
 			# Sorry, for the moment it doesn't work
 			a.attributes['href'] = "mailto:#{email}"
 			a << Text.new(obfuscate(email),false,nil,true)
 		a
 	end
@@ -797,7 +798,7 @@ of the form `#ff00ff`.
 			url = ref[:url]
 			title = ref[:title]
 			a.attributes['src'] = url.to_s
-			a.attributes['alt'] = children_to_s
+			a.attributes['alt'] = children_to_s
 		else
 			maruku_error"Could not find id = #{id.inspect} for\n #{self.inspect}"
 			tell_user "Could not create image with ref_id = #{id.inspect};"+
@@ -807,7 +808,7 @@ of the form `#ff00ff`.
     raise "IMAGE: #{url}"
 		return a
 	end
 	def to_html_im_image
 		if not url = self.url
 			maruku_error "Image with no url: #{self.inspect}"
@@ -822,7 +823,7 @@ of the form `#ff00ff`.
 		title = self.title
 		a =  create_html_element 'img'
 		a.attributes['src'] = url.to_s
-		a.attributes['alt'] = children_to_s
+		a.attributes['alt'] = children_to_s
 		return a
 	end
@@ -836,7 +837,7 @@ If true, raw HTML is discarded from the output.
 	def to_html_raw_html
 		return [] if get_setting(:filter_html)
 		raw_html = self.raw_html
 		if rexml_doc = @parsed_html
 			root = rexml_doc.root
@@ -849,9 +850,9 @@ If true, raw HTML is discarded from the output.
 				#div << Text.new(s)
 				return div
 			end
 			# copies the @children array (FIXME is it deep?)
-			elements =  root.to_a
+			elements =  root.to_a
 			return elements
 		else # invalid
 			# Creates red box with offending HTML
@@ -871,28 +872,28 @@ If true, raw HTML is discarded from the output.
 		abbr.attributes['title'] = self.title if self.title
 		abbr
 	end
 	def to_html_footnote_reference
 		id = self.footnote_id
 		# save the order of used footnotes
 		order = @doc.footnotes_order
 		if order.include? id
 		  # footnote has already been used
 		  return []
 	  end
 	  if not @doc.footnotes[id]
 	    return []
     end
 		# take next number
 		order << id
-		#num = order.size;
+		#num = order.size;
 		num = order.index(id) + 1
 		sup = Element.new 'sup'
 		sup.attributes['id'] = "#{get_setting(:doc_prefix)}fnref:#{num}"
 			a = Element.new 'a'
@@ -900,15 +901,15 @@ If true, raw HTML is discarded from the output.
 			a.attributes['href'] = "\##{get_setting(:doc_prefix)}fn:#{num}"
 			a.attributes['rel'] = 'footnote'
 		sup << a
 		sup
 	end
 ## Definition lists ###
 	def to_html_definition_list() add_ws wrap_as_element('dl') end
 	def to_html_definition() children_to_html end
 	def to_html_definition_term() add_ws wrap_as_element('dt') end
-	def to_html_definition_data() add_ws wrap_as_element('dd') end
+	def to_html_definition_data() add_ws wrap_as_element('dd') end
 	# FIXME: Ugly code
 	def to_html_table
@@ -922,28 +923,28 @@ If true, raw HTML is discarded from the output.
 			rows << @children.slice(i, num_columns)
 			i += num_columns
 		end
 		table = create_html_element 'table'
 			thead = Element.new 'thead'
 			tr = Element.new 'tr'
 				array_to_html(head).each do |x| tr<<x end
 			thead << tr
 			table << thead
 			tbody = Element.new 'tbody'
 			rows.each do |row|
 				tr = Element.new 'tr'
-					array_to_html(row).each_with_index do |x,i|
-						x.attributes['style'] ="text-align: #{align[i].to_s};"
-						tr<<x
+					array_to_html(row).each_with_index do |x,i|
+						x.attributes['style'] ="text-align: #{align[i].to_s};"
+						tr<<x
 					end
 				tbody << tr << Text.new("\n")
 			end
 			table << tbody
 		table
 	end
 	def to_html_head_cell; wrap_as_element('th') end
 	def to_html_cell
 		if @attributes[:scope]
@@ -952,22 +953,22 @@ If true, raw HTML is discarded from the output.
 			wrap_as_element('td')
 		end
  	end
-	def to_html_entity
+	def to_html_entity
 		MaRuKu::Out::Latex.need_entity_table
 		entity_name = self.entity_name
 		if (e = MaRuKu::Out::Latex::ENTITY_TABLE[entity_name]) && e.html_num
 			entity_name = e.html_num
 		end
 		# Fix for Internet Explorer
 		if entity_name == 'apos'
 			entity_name = 39
 		end
 		if entity_name.kind_of? Fixnum
 #			Entity.new(entity_name)
 			Text.new('&#%d;' % [entity_name],  false, nil, true)
@@ -993,7 +994,7 @@ If true, raw HTML is discarded from the output.
 #          puts "init: #{res.inspect}"
                 first_header = true
 		array.each do |c|
-			method = c.kind_of?(MDElement) ?
+			method = c.kind_of?(MDElement) ?
 			   "to_html_#{c.node_type}" : "to_html"
 			if not c.respond_to?(method)
@@ -1001,7 +1002,7 @@ If true, raw HTML is discarded from the output.
 				next
 			end
       Thread.current['line_no'] = c.line_no if c.respond_to? :line_no
 			h =  c.send(method)
 #            puts "HHHHH: #{h.inspect} e: #{e.inspect}"