maruku 0.4.2.1 → 0.5.0

data/lib/maruku/output/to_latex.rb

@@ -42,12 +42,22 @@ class MDDocument
 		children_to_latex
 	end
 
-	
+=begin maruku_doc
+Attribute: maruku_signature
+Scope: document
+Output: html, latex
+Summary: Enables Maruku's signature.
+Default: true
+
+If false, Maruku does not append a signature to the
+generated file.
+=end
+
 	# Render as a complete LaTeX document 
 	def to_latex_document
 		body = to_latex
 		
-		if get_boolean_setting(:maruku_signature)
+		if get_setting(:maruku_signature)
 			body += render_latex_signature 
 		end
 		
@@ -68,14 +78,17 @@ You have to have these fonts installed -- and this can be a pain.
 
 If `latex_cjk` is specified, this is added to the preamble:
 
+<?mrk puts "ciao" ?> 
+
 <?mrk md_codeblock(Maruku::MDDocument::Latex_preamble_enc_cjk) ?>
 
+
 while the default is to add this:
 
 <?mrk md_codeblock(Maruku::MDDocument::Latex_preamble_enc_utf8) ?>
 
 =end
-		encoding = @doc.attributes[:latex_cjk] ? 
+		encoding = get_setting(:latex_cjk) ? 
 			Latex_preamble_enc_cjk : Latex_preamble_enc_utf8
 
 =begin maruku_doc
@@ -138,7 +151,6 @@ Created by \\href{http://maruku.rubyforge.org}{Maruku} #{self.nice_date}.
 end end
 
 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
@@ -147,9 +159,7 @@ module MaRuKu; module Out; module Latex
 		children_to_latex+"\n\n"
 	end
 
-	def get_setting(name, default=nil)
-		self.attributes[name] || @doc.attributes[name] || default
-	end
+	
 =begin maruku_doc
 Title: Input format for colors
 Output: latex, html
@@ -180,8 +190,31 @@ Admissible formats:
 		end
 	end
 	
-	def to_latex_code;
-		raw_code = self.raw_code
+=begin maruku_doc
+Attribute: code_show_spaces
+Scope: global, document, element
+
+If `true`, shows spaces and tabs in code blocks.
+
+Example:
+
+		 One space
+		  Two spaces
+			 	Tab, space, tab
+					Tab, tab, tab and all is green!
+	{:code_show_spaces code_background_color=#ffeedd}
+{:markdown}
+	
+That will produce:
+
+	 One space
+	  Two spaces
+		 	Tab, space, tab
+				Tab, tab, tab and all is green!
+{:code_show_spaces code_background_color=#ffeedd}
+
+=end
+	
 =begin maruku_doc
 Attribute: latex_use_listings
 Scope: document
@@ -202,33 +235,35 @@ Otherwise, a standard `verbatim` environment is used.
 
 	Please refer to the documentation of the `listings` package for
 	supported languages.
-	
+
 	If a language is not supported, the `listings` package will emit
 	a warning during the compilation. Just press enter and nothing
 	wrong will happen.
 
 *	If the `code_show_spaces` is specified, than spaces and tabs will
 	be shown using the macro:
-	
+
 		\lstset{showspaces=true,showtabs=true}
-	
+
 *	The background color is given by `code_background_color`.
 
 =end
+
+	def to_latex_code;
+		raw_code = self.raw_code
 		
-		if @doc.attributes[:latex_use_listings]
+		if get_setting(:latex_use_listings)
 			@doc.latex_require_package('listings')
 				
 			s = "\\lstset{columns=fixed,frame=shadowbox}"
 
-			show_spaces = get_setting(:code_show_spaces) 
-			if show_spaces
+			if get_setting(:code_show_spaces) 
 				s+= "\\lstset{showspaces=true,showtabs=true}\n"
 			else
 				s+= "\\lstset{showspaces=false,showtabs=false}\n"
 			end
 			
-			color = latex_color get_setting(:code_background_color,DEFAULT_CODE_COLOR)
+			color = latex_color get_setting(:code_background_color)
 			
 			s+= "\\lstset{backgroundcolor=#{color}}\n" 
 			
@@ -287,8 +322,12 @@ Otherwise, a standard `verbatim` environment is used.
 		"\\item #{children_to_latex}\n"
 	end
 
-	def to_latex_strong;    wrap_as_span('\bf')           end
-	def to_latex_emphasis;  wrap_as_span('\em')               end
+	def to_latex_strong
+		"\\textbf{#{children_to_latex}}"
+ 	end
+	def to_latex_emphasis
+		"\\emph{#{children_to_latex}}"
+	end
 	
 	def wrap_as_span(c)
 		"{#{c} #{children_to_latex}}"
@@ -300,11 +339,21 @@ Otherwise, a standard `verbatim` environment is used.
 \\end{#{name}}\n"	
 	end
 	
+	SAFE_CHARS = Set.new((?a..?z).to_a + (?A..?Z).to_a)
 	# the ultimate escaping
 	# (is much better than using \verb)
 	def latex_escape(source)
 		s=""; 
-		source.each_byte do |b| s+= "\\char%d" % b end
+		
+		source.each_byte do |b| 
+			if b == ?\ 
+				s << '~'
+			elsif SAFE_CHARS.include? b
+				s << b
+			else
+				s += "\\char%d" % b 
+			end
+		end
 		s
 	end
 	
@@ -314,14 +363,13 @@ Otherwise, a standard `verbatim` environment is used.
 		# Convert to printable latex chars 
 		s = latex_escape(source)
 		
-		color = get_setting(:code_background_color,DEFAULT_CODE_COLOR)
+		color = get_setting(:code_background_color)
 		colorspec = latex_color(color, 'colorbox')
 
 		"#{colorspec}{\\tt #{s}}"
 	end
 
 	def to_latex_immediate_link
-		a =  create_html_element 'a'
 		url = self.url
 		text = url.gsub(/^mailto:/,'') # don't show mailto
 #			gsub('~','$\sim$')
@@ -348,11 +396,6 @@ Otherwise, a standard `verbatim` environment is used.
 	
 	def to_latex_link
 		id = self.ref_id
-		# if empty, use text
-		if id.size == 0
-			id = children.to_s.downcase
-		end
-		
 		ref = @doc.refs[id]
 		if not ref
 			$stderr.puts "Could not find id = '#{id}'"

data/lib/maruku/output/to_latex_entities.rb

@@ -25,11 +25,17 @@ module MaRuKu; module Out; module Latex
 	
 	include REXML
 	
-	
 	def to_latex_entity 
+		MaRuKu::Out::Latex.need_entity_table
+		
 		entity_name = self.entity_name
 	
 		entity = ENTITY_TABLE[entity_name]
+		if not entity
+			maruku_error "I don't know how to translate entity '#{entity_name}' "+
+			"to LaTeX."
+			return ""
+		end
 		replace = entity.latex_string
 		
 		entity.latex_packages.each do |p|
@@ -55,8 +61,14 @@ module MaRuKu; module Out; module Latex
 		safe_attr_accessor :latex_packages, Array
 	end
 	
+	def Latex.need_entity_table
+		Latex.init_entity_table if ENTITY_TABLE.empty?
+	end
+	
 	# create hash @@entity_to_latex
 	def Latex.init_entity_table
+		$stderr.write "Creating entity table.."
+		$stderr.flush
 		doc = Document.new XML_TABLE
 		doc.elements.each("//char") do |c| 
 			num =  c.attributes['num'].to_i
@@ -80,6 +92,7 @@ module MaRuKu; module Out; module Latex
 			ENTITY_TABLE[num] = e
 			ENTITY_TABLE[name] = e
 		end
+		$stderr.puts "..done."
 	end
 	
 	ENTITY_TABLE = {}
@@ -349,7 +362,6 @@ module MaRuKu; module Out; module Latex
 		<char num='254' name='thorn' convertTo='\\thorn' package='wasysym' />
 	</chars>"
 	
-	init_entity_table
 
 end end end
 

data/lib/maruku/output/to_s.rb

@@ -38,6 +38,14 @@ class MDElement
 		title.gsub!(/ /,'_')
 		title.downcase!
 		title.gsub!(/[^\w_]/,'')
+		title.strip!
+		
+		if title.size == 0
+			$uid ||= 0
+			$uid += 1
+			title = "id#{$uid}"
+		end
+		
 		title
 	end
 end

data/lib/maruku/structures.rb

@@ -43,7 +43,7 @@ EOF
 		attr_accessor symbol
 	end
 	
-	alias  safe_attr_accessor  safe_attr_accessor1
+	alias  safe_attr_accessor  safe_attr_accessor2
 end
 
 module MaRuKu

data/lib/maruku/tests/benchmark.rb

@@ -20,7 +20,7 @@
 
 
 require 'maruku'
-require 'bluecloth'
+#require 'bluecloth'
 
 
 data = $stdin.read
@@ -35,7 +35,7 @@ methods =
 [
 	
 	[Maruku,    :to_html],
-	[BlueCloth, :to_html],
+#	[BlueCloth, :to_html],
 	[Maruku,    :to_latex]
 	
 ]

data/lib/maruku/tests/new_parser.rb

@@ -20,6 +20,7 @@
 
 
 require 'maruku'
+require 'maruku/ext/math'
 
 module MaRuKu; module Tests
 	# 5 accented letters in italian, encoded as UTF-8
@@ -149,10 +150,12 @@ module MaRuKu; module Tests
 		# links of the form [text][ref]
 		["\\[a]",  ["[a]"], 'Escaping 1'],
 		["\\[a\\]", ["[a]"], 'Escaping 2'],
-		["[a]",   ["a"],   'Not a link'],
-		["[a][]",   [ md_link(["a"],'')], 'Empty link'],
-		["[a][]b",   [ md_link(["a"],''),'b'], 'Empty link'],
-		["[a\\]][]", [ md_link(["a]"],'')], 'Escape inside link'],
+# This is valid in the new Markdown version
+#		["[a]",   ["a"],   'Not a link'],
+		["[a]",   [ md_link(["a"],'a')], 'Empty link'],
+		["[a][]", ],
+		["[a][]b",   [ md_link(["a"],'a'),'b'], 'Empty link'],
+		["[a\\]][]", [ md_link(["a]"],'a]')], 'Escape inside link'],
 		
 		["[a",  :throw,   'Link not closed'],
 		["[a][",  :throw,   'Ref not closed'],
@@ -256,7 +259,12 @@ module MaRuKu; module Tests
 		['[bar](/url/ "Title with "quotes" inside")', 
 			[md_im_link(["bar"],'/url/', 'Title with "quotes" inside')],
 			"Link with quotes"],
-		
+
+# We dropped this idea		
+#		['$20,000 and $30,000', ['$20,000 and $30,000'], 'Math: spaces'],
+		['$20,000$', [md_inline_math('20,000')]],
+#		['$ 20,000$', ['$ 20,000$']],
+#		['$20,000 $ $20,000$', ['$20,000 $ ', md_inline_math('20,000')]],
 		["#{Maruku8}", [Maruku8], "Reading UTF-8"],
 		["#{AccIta1}", [AccIta8], "Converting ISO-8859-1 to UTF-8", 
 			{:encoding => 'iso-8859-1'}],

data/lib/maruku/version.rb

@@ -19,7 +19,7 @@
 #++
 
 module MaRuKu
-	Version = '0.4.2.1'
+	Version = '0.5.0'
 	
 	MarukuURL = 'http://maruku.rubyforge.org/'
 	

data/lib/sort_prof.rb

@@ -0,0 +1,22 @@
+
+field = (ARGV.shift or '2').to_i
+
+lines = $stdin.read.split("\n")
+# leave the first lines
+
+while l = lines.shift
+	puts l
+	break if l =~ /total/
+end
+
+
+
+
+puts lines.sort {|a,b| 
+	a.split[field].to_f <=> b.split[field].to_f
+}.reverse.join("\n")
+	
+	
+	
+
+

data/tests/diagrams/diagrams.md

@@ -0,0 +1,54 @@
+
+I would like to add a syntax for drawing basic diagrams
+and convert them to PNG/PDF/SVG.
+
+
+	+----------+      +----------+
+	| Makefile | ---> | Compiler |  ==> ...
+	+----------+      +----------+
+	     |                ^
+	     v                |
+	 ---------            
+{:diagram title="My diagram"}
+
+
+{:diagram: style=""}
+
+How to do vertical bold arrows?
+
+	!
+	V 
+
+Curved arrows:
+                             +-> | Yes: |
+	 ___________________    /
+	| is the agent ok? | --|
+	 --------------{:r}+
+
+	{:r: border="solid 3px red"}
+
+Big boxes:
+
+	+-------+
+	|{:long}|  ---> 
+	+-------+
+	
+	{+long: This is a long box}
+	
+Or
+
+	+----------------+         ________
+	| This is a very |  --->  | Box    |
+	| long cell      |        |________|
+	+----------------+
+	          - Yes
+	        /  
+	-------+ 
+	        \
+	          - No
+
+
+
+
+
+

data/tests/math/syntax.md

@@ -0,0 +1,46 @@
+LaTeX preamble: preamble.tex
+CSS: math.css
+
+Here are some formulas:
+
+*	$\alpha$
+*	$x^{n}+y^{n} \neq z^{n}$
+
+Some inline maths: $\sum_{n=1}^\infty \frac{(-1)^n}{n} = \ln 2$. 
+
+Some display  maths:
+
+\[ \sum_{n=1}^\infty \frac{1}{n} \]
+\[ \sum_{n=1}^\infty \frac{1}{n} \text{ is divergent, but } \lim_{n \to \infty} \sum_{i=1}^n \frac{1}{i} - \ln n \text{ exists.} \]     (a)
+
+Some random AMSTeX symbols - thanks to Robin Snader for adding these:
+
+$$ \beth \Subset \bigtriangleup \smallsmile \bumpeq \ggg \pitchfork $$ 
+
+Note that $\hat g$ , $J$, and $\gamma_1\gamma_2$ all restrict to
+
+$x_1 \overline{x_2} \oplus x_2 \overline{x_1}$ and that this module
+is linear in $x_1$ and $x_2$.
+
+See label \eqref{a}.
+
+$$ \href{#hello}{\alpha+\beta} $$
+
+## Cross references ##
+
+The following are 4 equations, labeled A,B,C,D:
+
+$$ \alpha $$ (A)
+
+\[ 
+	\beta
+\] (B) 
+
+$$ \gamma \label{C} $$
+
+\[ 
+	\delta \label{D}
+\]
+
+You can now refer to (eq:A), (eq:B), \eqref{C}, \eqref{D}.
+