maruku 0.3.0 → 0.4.0

data/lib/maruku/{to_latex.rb → output/to_latex.rb}

@@ -1,3 +1,4 @@
+#--
 #   Copyright (C) 2006  Andrea Censi  <andrea (at) rubyforge.org>
 #
 # This file is part of Maruku.
@@ -15,9 +16,13 @@
 #   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
+#++
 
 
-class Maruku
+module MaRuKu
+	
+class MDDocument
+
 	
 	# Render as a LaTeX fragment 
 	def to_latex
@@ -28,7 +33,7 @@ class Maruku
 	def to_latex_document
 		header = ""
 		
-		if @doc.meta[:latex_use_listings]
+		if @doc.attributes[:latex_use_listings]
 			header += "\\usepackage{listings}\n"
 		end
 
@@ -61,13 +66,10 @@ Created by \\href{http://maruku.rubyforge.org}{Maruku} #{self.nice_date}.
 \\end{tiny}"
 	end
 
-end
-
-class MDElement
-	DEFAULT_CODE_COLOR = '#f0f0e0'
-end
+end end
 
-class MDElement
+module MaRuKu; module Out; module Latex
+	include Maruku::Defaults
 	
 	def to_latex_hrule; "\n\\vspace{.5em} \\hrule \\vspace{.5em}\n" end
 	def to_latex_linebreak; "\\linebreak " end
@@ -77,7 +79,7 @@ class MDElement
 	end
 
 	def get_setting(name, default=nil)
-		self.meta[name] || @doc.meta[name] || default
+		self.attributes[name] || @doc.attributes[name] || default
 	end
 	
 	# \color[named]{name} 	
@@ -97,10 +99,9 @@ class MDElement
 	end
 	
 	def to_latex_code;
-		raw_code = @meta[:raw_code] 
+		raw_code = self.raw_code
 		
-		if @doc.meta[:latex_use_listings]
-#			puts @meta.inspect
+		if @doc.attributes[:latex_use_listings]
 			s = "\\lstset{columns=fixed,frame=shadowbox}"
 
 			show_spaces = get_setting(:code_show_spaces) 
@@ -117,7 +118,7 @@ class MDElement
 			s+= "\\lstset{basicstyle=\\ttfamily\\footnotesize}\n" 
 			
 			
-			lang = self.meta[:lang] || @doc.meta[:code_lang] || '{}'
+			lang = self.attributes[:lang] || @doc.attributes[:code_lang] || '{}'
 			if lang
 				s += "\\lstset{language=#{lang}}\n"
 			end
@@ -135,14 +136,14 @@ class MDElement
 		4=>'paragraph'}
 
 	def to_latex_header
-		h = TexHeaders[@meta[:level]] || 'paragraph'
+		h = TexHeaders[self.level] || 'paragraph'
 		
 		title = children_to_latex
 		if number = section_number
 			title = number + title
 		end
 		
-		if id = @meta[:id]
+		if id = self.attributes[:id]
 			# drop '#' at the beginning
 			if id[0,1] == '#' then id = [1,id.size] end
 			%{\\hypertarget{%s}{}\\%s*{{%s}}\\label{%s}\n\n} % [ id, h, title, id ]
@@ -153,7 +154,7 @@ class MDElement
 	
 	
 	def to_latex_ul;       
-		if @meta[:toc]
+		if self.attributes[:toc]
 			@doc.toc.to_latex
 		else
 			wrap_as_environment('itemize')
@@ -171,7 +172,6 @@ class MDElement
 
 	def to_latex_strong;    wrap_as_span('\bf')           end
 	def to_latex_emphasis;  wrap_as_span('\em')               end
-#	def to_html_header;    wrap_as_element "h#{@meta[:level]}" end
 	
 	def wrap_as_span(c)
 		"{#{c} #{children_to_latex}}"
@@ -192,7 +192,7 @@ class MDElement
 	end
 	
 	def to_latex_inline_code; 
-		source = self.meta[:raw_code]
+		source = self.raw_code
 		
 		# Convert to printable latex chars 
 		s = latex_escape(source)
@@ -204,12 +204,12 @@ class MDElement
 	end
 
 	def to_latex_immediate_link
-		url = @meta[:url]
+		url = self.url
 		return "\\href{#{url}}{#{url.to_latex}}"
 	end
 	
 	def to_latex_link
-		if id = @meta[:ref_id]
+		if id = self.ref_id
 			# if empty, use text
 			if id.size == 0
 				id = children.to_s.downcase
@@ -231,7 +231,7 @@ class MDElement
 				end
 			end
 		else
-			url = @meta[:url]
+			url = self.url
 
 			if url[0,1] == '#'
 				url = url[1,url.size]
@@ -243,13 +243,13 @@ class MDElement
 	end
 	
 	def to_latex_email_address
-		email = @meta[:email]
+		email = self.email
 		"\\href{mailto:#{email}}{#{latex_escape(email)}}"
 	end
 	
 	
 	def to_latex_table
-		align = @meta[:align]
+		align = self.align
 		num_columns = align.size
 
 		head = @children.slice(0, num_columns)
@@ -287,7 +287,7 @@ class MDElement
 	
 	
 	def to_latex_footnote_reference
-		id = @meta[:footnote_id]
+		id = self.footnote_id
 		f = @doc.footnotes[id]
 		if f
 			"\\footnote{#{f.children_to_latex.strip}} "
@@ -309,8 +309,8 @@ class MDElement
 	end
 	
 	def to_latex_definition		
-		terms = @meta[:terms]
-		definitions = @meta[:definitions]
+		terms = self.terms
+		definitions = self.definitions
 		
 		s = ""
 		terms.each do |t|
@@ -325,12 +325,12 @@ class MDElement
 	end
 	
 
-	def to_latex_abbreviation
+	def to_latex_abbr
 		children_to_latex
 	end
 
 	def to_latex_image
-		id = @meta[:ref_id]
+		id = self.ref_id
 		ref = @doc.refs[id]
 		if not ref
 			$stderr.puts "Could not find id = '#{id}'"
@@ -341,12 +341,8 @@ class MDElement
 		end
 
 	end
-end
 
 
-# Some utilities
-class MDElement
-	
 	# Convert each child to html
 	def children_to_latex
 		array_to_latex(@children)
@@ -359,7 +355,8 @@ class MDElement
 			   "to_latex_#{c.node_type}" : "to_latex"
 			
 			if not c.respond_to?(method)
-				raise "Object does not answer to #{method}: #{c.class} #{c.inspect[0,100]}"
+		#		raise "Object does not answer to #{method}: #{c.class} #{c.inspect[0,100]}"
+				next
 			end
 			
 			h =  c.send(method)
@@ -377,5 +374,4 @@ class MDElement
 		e.join(join_char)
 	end
 	
-end
-
+end end end # MaRuKu::Out::Latex

data/lib/maruku/{to_latex_entities.rb → output/to_latex_entities.rb}

@@ -1,10 +1,32 @@
+#--
+#   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
+#++
+
+
 require 'rexml/document'
 
-class MDElement
+module MaRuKu; module Out; module Latex
+	
 	include REXML
 	
 	def to_latex_entity 
-		entity_name = @meta[:entity_name]
+		entity_name = self.entity_name
 		
 		MDElement.init_tables
 		
@@ -297,5 +319,5 @@ class MDElement
 	  <char num='255' name='yuml' convertTo='\\@DOUBLEQUOTy' />                  
 	</chars>"
 
-end
+end end end
 

data/lib/maruku/output/to_latex_strings.rb

@@ -0,0 +1,64 @@
+#--
+#   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
+#++
+
+
+
+class String
+
+	# These are TeX's special characters
+	LATEX_ADD_SLASH = [ ?{, ?}, ?$, ?&, ?#, ?_, ?%]
+
+	# These, we transform to {\tt \char<ascii code>}
+	LATEX_TO_CHARCODE = [ ?^, ?~, ?>,?<]
+
+	def escape_to_latex(s)
+		s2 = ""
+		s.each_byte do |b|
+			if LATEX_TO_CHARCODE.include? b
+				s2 += "{\\tt \\char#{b}}" 
+			elsif LATEX_ADD_SLASH.include? b
+				s2 << ?\\ << b
+			elsif b == ?\\
+			# there is no backslash in cmr10 fonts
+				s2 += "$\\backslash$"
+			else
+				s2 << b
+			end
+		end
+		s2
+	end
+	
+	# escapes special characters
+	def to_latex
+		s = escape_to_latex(self)
+		OtherGoodies.each do |k, v|
+			s.gsub!(k, v)
+		end
+		s
+	end
+	
+	# other things that are good on the eyes
+	OtherGoodies = {
+		/(\s)LaTeX/ => '\1\\LaTeX\\xspace ', # XXX not if already \LaTeX
+#		'HTML' => '\\textsc{html}\\xspace ',
+#		'PDF' => '\\textsc{pdf}\\xspace '
+	}
+	
+end

data/lib/maruku/output/to_markdown.rb

@@ -0,0 +1,164 @@
+#--
+#   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
+#++
+
+
+class String
+	# XXX: markdown escaping
+	def to_md(c=nil)
+		to_s
+	end
+	
+	# " andrea censi " => [" andrea ", "censi "]
+	def mysplit
+		split.map{|x| x+" "}
+	end
+end
+
+
+module MaRuKu; module Out; module Markdown 
+	
+	DefaultLineLength = 40
+	
+	def to_md(context={})
+		children_to_md(context)
+	end
+	
+	def to_md_paragraph(context)
+		line_length = context[:line_length] || DefaultLineLength
+		wrap(@children, line_length, context)+"\n"
+	end
+	
+	def to_md_li_span(context)
+		len = (context[:line_length] || DefaultLineLength) - 2
+		s = add_tabs(wrap(@children, len-2, context), 1, '  ')
+		s[0] = ?*
+		s + "\n"
+	end
+	
+	def to_md_abbr_def(context)
+		"*[#{self.abbr}]: #{self.text}\n"
+	end
+	
+	def to_md_ol(context)
+		len = (context[:line_length] || DefaultLineLength) - 2
+		md = ""
+		self.children.each_with_index do |li, i|
+			s = add_tabs(w=wrap(li.children, len-2, context), 1, '    ')+"\n"
+			s[0,4] = "#{i+1}.  "[0,4]
+#			puts w.inspect
+			md += s
+		end
+		md + "\n"
+	end
+
+	def to_md_ul(context)
+		len = (context[:line_length] || DefaultLineLength) - 2
+		md = ""
+		self.children.each_with_index do |li, i|
+			w = wrap(li.children, len-2, context)
+#			puts "W: "+ w.inspect
+			s = add_indent(w)
+#			puts "S: " +s.inspect
+			s[0,1] = "-"
+			md += s
+		end
+		md + "\n"
+	end
+	
+	def add_indent(s,char="    ")
+		t = s.split("\n").map{|x| char+x }.join("\n")
+		s << ?\n if t[-1] == ?\n
+		s
+	end
+	
+	# Convert each child to html
+	def children_to_md(context)
+		array_to_md(@children, context)
+	end
+	
+	def wrap(array, line_length, context)
+		out = ""
+		line = ""
+		array.each do |c|
+			if c.kind_of?(MDElement) &&  c.node_type == :linebreak
+				out << line.strip << "  \n"; line="";
+				next
+			end
+		
+			pieces =
+			if c.kind_of? String
+				c.to_md.mysplit
+			else
+				[c.to_md(context)].flatten
+			end
+		
+	#			puts "Pieces: #{pieces.inspect}"
+			pieces.each do |p|
+				if p.size + line.size > line_length
+					out << line.strip << "\n"; 
+					line = ""
+				end
+				line << p
+			end
+		end
+		out << line.strip << "\n" if line.size > 0
+		out << ?\n if not out[-1] == ?\n
+		out
+	end
+
+
+	def array_to_md(array, context, join_char='')
+		e = []
+		array.each do |c|
+			method = c.kind_of?(MDElement) ? 
+			   "to_md_#{c.node_type}" : "to_md"
+			
+			if not c.respond_to?(method)
+				#raise "Object does not answer to #{method}: #{c.class} #{c.inspect[0,100]}"
+#				tell_user "Using default for #{c.node_type}"
+				method = 'to_md'
+			end
+			
+#			puts "#{c.inspect} created with method #{method}"
+			h =  c.send(method, context)
+			
+			if h.nil?
+				raise "Nil md for #{c.inspect} created with method #{method}"
+			end
+			
+			if h.kind_of?Array
+				e = e + h
+			else
+				e << h
+			end
+		end
+		e.join(join_char)
+	end
+	
+end end end
+
+module MaRuKu; class MDDocument
+	alias old_md to_md
+	def to_md(context={})
+		s = old_md(context)
+#		puts s
+		s
+	end	
+end end