maruku 0.5.0 → 0.5.1

data/lib/maruku/ext/math/to_html.rb

@@ -42,14 +42,6 @@ Same thing as `html_math_engine`, only for PNG output.
 module MaRuKu; module Out; module HTML
 
 
-	def add_class_to(el, cl)
-		el.attributes['class'] = 
-		if already = el.attributes['class']
-			already + " " + cl
-		else
-			cl
-		end
-	end
 	
 	# Creates an xml Mathml document of self.math
 	def render_mathml(kind, tex)

data/lib/maruku/input/charsource.rb

@@ -205,8 +205,9 @@ class CharSourceStrscan
 	include SpanLevelParser
 	include MaRuKu::Strings
 	
-	def initialize(s)
+	def initialize(s, parent=nil)
 		@s = StringScanner.new(s)
+		@parent = parent
 	end
 	
 	# Return current char as a FixNum (or nil).
@@ -273,9 +274,9 @@ end
 
 
 class CharSourceDebug
-	def initialize(s)
-		@a = CharSourceManual.new(s)
-		@b = CharSourceStrscan.new(s)
+	def initialize(s, parent)
+		@a = CharSourceManual.new(s, parent)
+		@b = CharSourceStrscan.new(s, parent)
 	end
 	
 	def method_missing(methodname, *args)

data/lib/maruku/input/parse_doc.rb

@@ -127,6 +127,7 @@ Disabled by default because of security concerns.
 						result[:unresolved_references] << " #{v}"
 					end
 					
+				#	$stderr.puts "Unresolved reference #{v.inspect} (avail: #{self.ald.keys.inspect})"
 					result[v.to_sym] = true
 				end
 			else

data/lib/maruku/input/parse_span_better.rb

@@ -278,10 +278,10 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 	end
 
 	def extension_meta(src, con, break_on_chars)
-		if m = src.read_regexp(/(\w)+\:/)
+		if m = src.read_regexp(/([^:]+):/)
 			name = m[1]
-			content = m[2]
 			al = read_attribute_list(src, con, break_on_chars)
+#			puts "#{name}=#{al.inspect}"
 			self.doc.ald[name] = al
 		 	con.push md_ald(name, al)
 		else
@@ -624,6 +624,11 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 			con.push_element md_im_image(alt_text, url, title)
 		when ?[ # link ref
 			ref_id = read_ref_id(src,con)
+			if ref_id.size == 0
+				ref_id =  alt_text.to_s.downcase.gsub(' ','_')
+			else
+				ref_id = ref_id.downcase
+			end
 			con.push_element md_image(alt_text, ref_id)
 		else # no stuff
 			con.push_elements children

data/lib/maruku/output/to_html.rb

@@ -394,7 +394,9 @@ by Maruku, to have the same results in both HTML and LaTeX.
 	def source2html(source)
 		source = source.gsub(/&/,'&')
 		source = Text.normalize(source)
-		Text.new(source, true, nil, false )
+		source = source.gsub(/\'/,''') # IE bug
+		source = source.gsub(/'/,''') # IE bug
+		Text.new(source, true, nil, true )
 	end
 		
 =begin maruku_doc
@@ -437,7 +439,6 @@ and
 
 		lang = 'xml' if lang=='html'
 
-
 		use_syntax = get_setting :html_use_syntax
 		
 		element = 
@@ -455,9 +456,17 @@ and
 				source = source.gsub(/\n*\Z/,'')
 				
 				html = convertor.convert( source )
-			
-				pre = Document.new(html, {:respect_whitespace =>:all}).root
-				pre.attributes['class'] = lang
+				html = html.gsub(/\'/,''') # IE bug
+				html = html.gsub(/'/,''') # IE bug
+	#			html = html.gsub(/&/,'&') 
+				
+				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"+
@@ -480,7 +489,7 @@ and
 		if color != Globals[:code_background_color]
 			element.attributes['style'] = "background-color: #{color};"
 		end
-		element
+		add_ws element
 	end
 	
 =begin maruku_doc
@@ -523,6 +532,10 @@ of the form `#ff00ff`.
 
 		text = Text.new(s, respect_ws=true, parent=nil, raw=true )
 		
+		if lang = self.attributes[:lang]
+			code.attributes['lang'] = lang
+			code.attributes['class'] = lang
+		end
 		code << text
 		pre
 	end
@@ -540,12 +553,40 @@ of the form `#ff00ff`.
 		pre
 	end
 
+	def add_class_to(el, cl)
+		el.attributes['class'] = 
+		if already = el.attributes['class']
+			already + " " + cl
+		else
+			cl
+		end
+	end
+
+	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:/
+			add_class_to(a, 'maruku-link-external')
+		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
 		text = url.gsub(/^mailto:/,'') # don't show mailto
 		a << Text.new(text)
 		a.attributes['href'] = url
+		add_class_to_link(a)
 		a
 	end
 	
@@ -564,6 +605,8 @@ of the form `#ff00ff`.
 			tell_user "Not creating a link for ref_id = #{id.inspect}."
 			return wrap_as_element('span')
 		end
+
+#		add_class_to_link(a)
 		return a
 	end
 	
@@ -623,7 +666,7 @@ of the form `#ff00ff`.
 		else
 			maruku_error"Could not find id = #{id.inspect} for\n #{self.inspect}"
 			tell_user "Could not create image with ref_id = #{id.inspect};"+
-				 +" Using SPAN element as replacement."
+				 " Using SPAN element as replacement."
 				return wrap_as_element('span')
 		end
 		return a

data/lib/maruku/output/to_latex.rb

@@ -506,11 +506,15 @@ Otherwise, a standard `verbatim` environment is used.
 		id = self.ref_id
 		ref = @doc.refs[id]
 		if not ref
-			$stderr.puts "Could not find id = '#{id}'"
+			maruku_error "Could not find ref #{id.inspect} for image.\n"+
+				"Available are: #{@docs.refs.keys.inspect}"
+#			$stderr.puts "Could not find id = '#{id}'"
 			""
 		else
 			url = ref[:url]
-			"{\\bf Images not supported yet (#{latex_escape(url)})}"
+			$stderr.puts "Images not supported yet (#{url})"
+			# "{\\bf Images not supported yet (#{latex_escape(url)})}"
+			""
 		end
 
 	end

data/lib/maruku/output/to_latex_entities.rb

@@ -67,8 +67,8 @@ module MaRuKu; module Out; module Latex
 	
 	# create hash @@entity_to_latex
 	def Latex.init_entity_table
-		$stderr.write "Creating entity table.."
-		$stderr.flush
+#		$stderr.write "Creating entity table.."
+#		$stderr.flush
 		doc = Document.new XML_TABLE
 		doc.elements.each("//char") do |c| 
 			num =  c.attributes['num'].to_i
@@ -92,7 +92,7 @@ module MaRuKu; module Out; module Latex
 			ENTITY_TABLE[num] = e
 			ENTITY_TABLE[name] = e
 		end
-		$stderr.puts "..done."
+#		$stderr.puts "..done."
 	end
 	
 	ENTITY_TABLE = {}

data/lib/maruku/version.rb

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

data/tests/unittest/attributes/attributes.md

@@ -22,9 +22,12 @@ md_el(:document,[
 	md_el(:header,["Header with attributes"],{:level=>2},[[:id, "header1"]]),
 	md_el(:header,["Header with attributes"],{:level=>3},[[:id, "header2"]]),
 	md_el(:header,["Header no attributes"],{:level=>3},[]),
-	md_par(["Paragraph with a."], [[:id, "par1"], [:ref, "warn2"]]),
-	md_par(["Paragraph with ", md_em(["emphasis"])], [[:id, "par2"]]),
-	md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"o"},[])
+	md_par(["Paragraph with a."], [[:id, "par1"]]),
+	md_par([
+		"Paragraph with ",
+		md_em(["emphasis"], [[:ref, "hello"], [:ref, "notfound"]])
+	], [[:id, "par2"]]),
+	md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"hello"},[])
 ],{},[])
 *** Output of to_html ***
 
@@ -36,7 +39,7 @@ md_el(:document,[
 
 <p id='par1'>Paragraph with a.</p>
 
-<p id='par2'>Paragraph with <em>emphasis</em></p>
+<p id='par2'>Paragraph with <em class='chello'>emphasis</em></p>
 
 *** Output of to_latex ***
 \hypertarget{header1}{}\subsection*{{Header with attributes}}\label{header1}
@@ -62,54 +65,10 @@ Header with attributesHeader with attributesHeader no attributesParagraph with a
 
 
 
-
-Failed tests:   [:inspect] 
-
-*** Output of inspect ***
------| WARNING | -----
-md_el(:document,[
-	md_el(:header,["Header with attributes"],{:level=>2},[[:id, "header1"]]),
-	md_el(:header,["Header with attributes"],{:level=>3},[[:id, "header2"]]),
-	md_el(:header,["Header no attributes"],{:level=>3},[]),
-	md_par(["Paragraph with a."], [[:id, "par1"]]),
-	md_par([
-		"Paragraph with ",
-		md_em(["emphasis"], [[:ref, "hello notfound"], [:ref, "notfound"]])
-	], [[:id, "par2"]]),
-	md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"o"},[])
-],{},[])
-*** Output of to_html ***
-
-<h2 id='header1'>Header with attributes</h2>
-
-<h3 id='header2'>Header with attributes</h3>
-
-<h3 id='header_no_attributes'>Header no attributes</h3>
-
-<p id='par1'>Paragraph with a.</p>
-
-<p id='par2'>Paragraph with <em>emphasis</em></p>
-
-*** Output of to_latex ***
-\hypertarget{header1}{}\subsection*{{Header with attributes}}\label{header1}
-
-\hypertarget{header2}{}\subsubsection*{{Header with attributes}}\label{header2}
-
-\hypertarget{header_no_attributes}{}\subsubsection*{{Header no attributes}}\label{header_no_attributes}
-
-Paragraph with a.
-
-Paragraph with \emph{emphasis}
+	OK!
 
 
-*** Output of to_md ***
-Header with attributesHeader with attributesHeader no attributesParagraph with a.
 
-Paragraph with emphasis
-
-
-*** Output of to_s ***
-Header with attributesHeader with attributesHeader no attributesParagraph with a.Paragraph with emphasis
 *** Output of Markdown.pl ***
 <h2>Header with attributes  {#header1}  </h2>
 

data/tests/unittest/blanks_in_code.md

@@ -36,19 +36,25 @@ md_el(:document,[
 *** Output of to_html ***
 
 <p>This block is composed of three lines:</p>
+
 <pre><code>one
 
 three
 </code></pre>
+
 <p>This block is composed of 5</p>
+
 <pre><code>one
 
 
 four
 
 </code></pre>
+
 <p>This block is composed of 2</p>
+
 <pre><code>two</code></pre>
+
 *** Output of to_latex ***
 This block is composed of three lines:
 

data/tests/unittest/code.md

@@ -17,10 +17,12 @@ md_el(:document,[
 *** Output of to_html ***
 
 <p>Here is an example of AppleScript:</p>
+
 <pre><code>tell application &quot;Foo&quot;
     beep
 end tell
 	tab</code></pre>
+
 *** Output of to_latex ***
 Here is an example of AppleScript:
 

data/tests/unittest/code2.md

@@ -13,7 +13,9 @@ md_el(:document,[
 
 <blockquote>
 <p>Code</p>
-<pre><code>Ciao</code></pre></blockquote>
+
+<pre><code>Ciao</code></pre>
+</blockquote>
 
 *** Output of to_latex ***
 \begin{quote}%

data/tests/unittest/code3.md

@@ -33,14 +33,22 @@ md_el(:document,[
 *** Output of to_html ***
 
 <p>This is code (4 spaces):</p>
+
 <pre><code>Code</code></pre>
+
 <p>This is not code</p>
+
 <pre><code>Code
 </code></pre>
+
 <p>This is code (1 tab):</p>
+
 <pre><code>Code</code></pre>
+
 <p>This is not code</p>
+
 <pre><code>Code</code></pre>
+
 *** Output of to_latex ***
 This is code (4 spaces):
 

data/tests/unittest/email.md

@@ -33,9 +33,9 @@ This is an email address:
 
 
 *** Output of Markdown.pl ***
-<p>This is an email address: <a href="&#x6D;&#x61;&#x69;&#108;t&#x6F;:&#97;&#x6E;&#100;&#114;&#x65;&#97;&#64;&#105;&#x6E;&#x76;&#x61;&#x6C;&#x69;&#x64;.&#x69;&#116;">&#97;&#x6E;&#100;&#114;&#x65;&#97;&#64;&#105;&#x6E;&#x76;&#x61;&#x6C;&#x69;&#x64;.&#x69;&#116;</a></p>
+<p>This is an email address: <a href="&#x6D;&#x61;&#105;&#108;&#116;&#111;:&#x61;&#x6E;&#100;&#x72;&#x65;&#97;&#64;i&#x6E;v&#97;&#108;&#105;&#100;&#x2E;&#105;&#116;">&#x61;&#x6E;&#100;&#x72;&#x65;&#97;&#64;i&#x6E;v&#97;&#108;&#105;&#100;&#x2E;&#105;&#116;</a></p>
 
 *** Output of Markdown.pl (parsed) ***
-<p>This is an email address: <a href='&amp;#x6D;&amp;#x61;&amp;#x69;&amp;#108;t&amp;#x6F;:&amp;#97;&amp;#x6E;&amp;#100;&amp;#114;&amp;#x65;&amp;#97;&amp;#64;&amp;#105;&amp;#x6E;&amp;#x76;&amp;#x61;&amp;#x6C;&amp;#x69;&amp;#x64;.&amp;#x69;&amp;#116;'>&#97;&#x6E;&#100;&#114;&#x65;&#97;&#64;&#105;&#x6E;&#x76;&#x61;&#x6C;&#x69;&#x64;.&#x69;&#116;</a
+<p>This is an email address: <a href='&amp;#x6D;&amp;#x61;&amp;#105;&amp;#108;&amp;#116;&amp;#111;:&amp;#x61;&amp;#x6E;&amp;#100;&amp;#x72;&amp;#x65;&amp;#97;&amp;#64;i&amp;#x6E;v&amp;#97;&amp;#108;&amp;#105;&amp;#100;&amp;#x2E;&amp;#105;&amp;#116;'>&#x61;&#x6E;&#100;&#x72;&#x65;&#97;&#64;i&#x6E;v&#97;&#108;&#105;&#100;&#x2E;&#105;&#116;</a
    ></p
  >

data/tests/unittest/entities.md

@@ -58,8 +58,10 @@ md_el(:document,[
 <p>Entity-substitution does not happen in code blocks or inline code.</p>
 
 <p>The following should not be translated:</p>
+
 <pre><code>&amp;copy;
 </code></pre>
+
 <p>It should read just like this: <code>&amp;copy;</code>.</p>
 
 *** Output of to_latex ***

data/tests/unittest/ie.md

@@ -0,0 +1,112 @@
+We must make sure that `'` is always written as `'`.
+
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+`<p>here's an apostrophe & a quote "</p>`
+
+	<p>here's an apostrophe & a quote "</p>
+{:}
+
+	<p>here's an apostrophe & a quote "</p>
+{:lang=xml}
+
+	<p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=not_supported}
+
+	<p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=xml}
+
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par([md_code("<p>here's an apostrophe & a quote \"</p>")]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>"},[]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>"},[["lang", "xml"]]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>"},[["html_use_syntax", "true"], ["lang", "not_supported"]]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>"},[["html_use_syntax", "true"], ["lang", "xml"]])
+],{},[])
+*** Output of to_html ***
+
+<p><code>&lt;p&gt;here&#39;s an apostrophe &amp; a quote &quot;&lt;/p&gt;</code></p>
+
+<pre><code>&lt;p&gt;here&#39;s an apostrophe &amp; a quote &quot;&lt;/p&gt;</code></pre>
+
+<pre><code class='xml' lang='xml'>&lt;p&gt;here&#39;s an apostrophe &amp; a quote &quot;&lt;/p&gt;</code></pre>
+
+<pre><code class='not_supported' lang='not_supported'>&lt;p&gt;here&#39;s an apostrophe &amp; a quote &quot;&lt;/p&gt;</code></pre>
+
+<pre><code class='xml' lang='xml'><span class='punct'>&lt;</span><span class='tag'>p</span><span class='punct'>&gt;</span>here&#39;s an apostrophe &amp; a quote &quot;<span class='punct'>&lt;/</span><span class='tag'>p</span><span class='punct'>&gt;</span></code></pre>
+
+*** Output of to_latex ***
+\colorbox[rgb]{1.00,0.93,1.00}{\tt \char60p\char62here\char39s~an~apostrophe~\char38~a~quote~\char34\char60\char47p\char62}
+
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+
+*** Output of to_md ***
+
+
+
+*** Output of to_s ***
+
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code></p>
+
+<pre><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code></pre>
+
+<p>{:}</p>
+
+<pre><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code></pre>
+
+<p>{:lang=xml}</p>
+
+<pre><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code></pre>
+
+<p>{:html<em>use</em>syntax=true lang=not_supported}</p>
+
+<pre><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code></pre>
+
+<p>{:html<em>use</em>syntax=true lang=xml}</p>
+
+*** Output of Markdown.pl (parsed) ***
+<p
+     ><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code
+   ></p
+   ><pre
+     ><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code
+   ></pre
+   ><p>{:}</p
+   ><pre
+     ><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code
+   ></pre
+   ><p>{:lang=xml}</p
+   ><pre
+     ><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code
+   ></pre
+   ><p>{:html<em>use</em
+     >syntax=true lang=not_supported}</p
+   ><pre
+     ><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;
+</code
+   ></pre
+   ><p>{:html<em>use</em
+     >syntax=true lang=xml}</p
+ >