Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

vendor/plugins/maruku/lib/maruku/input/type_detection.rb

@@ -50,11 +50,6 @@ module MaRuKu; module Strings
 		return :xml_instr if l =~ %r{^\s*<\?}
 		return :raw_html if l =~ %r{^[ ]?[ ]?[ ]?</?\s*\w+}
 		return :raw_html if l =~ %r{^[ ]?[ ]?[ ]?<\!\-\-}
-		# Something is wrong with how we parse lists! :-(
-		#return :ulist    if l =~ /^[ ]{0,3}([\*\-\+])\s+.*\w+/
-		#return :olist    if l =~ /^[ ]{0,3}\d+\..*\w+/
-		return :ulist    if l =~ /^[ ]{0,1}([\*\-\+])\s+.*/
-		return :olist    if l =~ /^[ ]{0,1}\d+\.\s+.*/
 		return :header1  if l =~ /^(=)+/ 
 		return :header2  if l =~ /^([-\s])+$/ 
 		return :header3  if l =~ /^(#)+\s*\S+/ 
@@ -62,6 +57,11 @@ module MaRuKu; module Strings
 		return :hrule    if l =~ /^(\s*\*\s*){3,1000}$/ 
 		return :hrule    if l =~ /^(\s*-\s*){3,1000}$/ # or hyphens
 		return :hrule    if l =~ /^(\s*_\s*){3,1000}$/ # or underscores	
+		# Something is wrong with how we parse lists! :-(
+		#return :ulist    if l =~ /^[ ]{0,3}([\*\-\+])\s+.*\w+/
+		#return :olist    if l =~ /^[ ]{0,3}\d+\..*\w+/
+		return :ulist    if l =~ /^[ ]{0,1}([\*\-\+])\s+.*/
+		return :olist    if l =~ /^[ ]{0,1}\d+\.\s+.*/
 		return :quote    if l =~ /^>/
 		return :metadata if l =~ /^@/
 #		if @@new_meta_data?
@@ -143,5 +143,5 @@ module MaRuKu; module Strings
 	TableSeparator = %r{^(\|?#{Sep}\|?)+?\s*$}
 
 
-	EMailAddress = /<([^:]+?@[^:]+?)>/
+	EMailAddress = /<([^:@>]+?@[^:@>]+?)>/
 end end

vendor/plugins/maruku/lib/maruku/output/to_html.rb

@@ -733,9 +733,10 @@ of the form `#ff00ff`.
 ##### Email address
 	
 	def obfuscate(s)
-		res = ''
+	    d = Nokogiri::XML::Document.new
+		res = Nokogiri::XML::NodeSet.new(d)
 		s.each_byte do |char|
-			res +=  "&#%03d;" % char
+			res <<  Nokogiri::XML::EntityReference.new(d, "#%03d" % char)
 		end
 		res
 	end
@@ -748,9 +749,9 @@ of the form `#ff00ff`.
 			#a.attributes.add Attribute.new('href',Text.new(
 			#"mailto:"+obfuscate(email),false,nil,true))
 			# Sorry, for the moment it doesn't work
-			a.attributes['href'] = "mailto:#{email}"
+			a['href'] = "mailto:#{email}"
 			
-			a << Nokogiri::XML::Text.new(obfuscate(email), d)
+			a << obfuscate(email)
 		a
 	end
 

vendor/plugins/maruku/spec/block_docs/email.md

@@ -11,7 +11,7 @@ md_el(:document,[
 	md_par(["This is an email address: ", md_email("andrea@invalid.it")])
 ],{},[])
 *** Output of to_html ***
-<p>This is an email address: <a href='mailto:andrea@invalid.it'>&#097;&#110;&#100;&#114;&#101;&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
+<p>This is an email address: <a href="mailto:andrea@invalid.it">&#097;&#110;&#100;&#114;&#101;&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
 *** Output of to_latex ***
 This is an email address: \href{mailto:andrea@invalid.it}{andrea\char64invalid\char46it}
 *** Output of to_md ***

vendor/plugins/maruku/spec/block_docs/hrule.md

@@ -22,7 +22,7 @@ md_el(:document,[
 	md_el(:hrule,[],{},[])
 ],{},[])
 *** Output of to_html ***
-<hr /><hr /><hr /><hr /><hr />
+<hr/><hr/><hr/><hr/><hr/>
 *** Output of to_latex ***
 \vspace{.5em} \hrule \vspace{.5em}
 

vendor/plugins/maruku/spec/block_docs/ie.md

@@ -31,7 +31,7 @@ md_el(:document,[
 
 <pre><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code></pre>
 
-<pre class="xml"><code lang="xml">&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code></pre>
+<pre class="xml"><code lang="xml"><span class="punct">&lt;</span><span class="tag">p</span><span class="punct">&gt;</span>here's an apostrophe &amp; a quote "<span class="punct">&lt;/</span><span class="tag">p</span><span class="punct">&gt;</span></code></pre>
 
 <pre class="not_supported"><code lang="not_supported">&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code></pre>
 

vendor/plugins/maruku/spec/block_docs/inline_html.md

@@ -6,13 +6,13 @@ CSS: style.css
 
 Input:
 
-	<em>Emphasis</em>
+    <em>Emphasis</em>
 
 Result: <em>Emphasis</em>
 
 Input:
 
-	<img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
+    <img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
 
 Result on span: <img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
 
@@ -25,14 +25,14 @@ Without closing:
 <img src="http://jigsaw.w3.org/css-validator/images/vcss">
 
 <div markdown="1">
-	This is *true* markdown text (paragraph)
+   This is *true* markdown text (paragraph)
 
-	<p markdown="1">
+   <p markdown="1">
-		This is *true* markdown text (no paragraph)
+   This is *true* markdown text (no paragraph)
-	</p>
+   </p>
-	<p markdown="block">
+   <p markdown="block">
-		This is *true* markdown text (block paragraph)
+   This is *true* markdown text (block paragraph)
-	</p>
+   </p>
 </div>
 
 <table>
@@ -78,7 +78,7 @@ md_el(:document,[
 <p>Result alone:</p>
 <img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
 <p>Without closing:</p>
-<img src="http://jigsaw.w3.org/css-validator/images/vcss" /><div>
+<img src="http://jigsaw.w3.org/css-validator/images/vcss"/><div>
 <p>
 <p>This is</p>
 <em>
@@ -95,7 +95,7 @@ md_el(:document,[
 <p>markdown text (no paragraph)</p>
 </p>
 </p>
-	<p>
+   <p>
 <p>
 <p>This is</p>
 <em>
@@ -106,8 +106,20 @@ md_el(:document,[
 </p>
 </div><table>
 <tr>
-<td><p>This is a</p><em><p>true</p></em><p>markdown text. (no par)</p></td>
+<td>
-<td><p>This is</p><em><p>true</p></em><p>markdown text. (par)</p></td>
+<p>This is a</p>
+<em>
+<p>true</p>
+</em>
+<p>markdown text. (no par)</p>
+</td>
+<td>
+<p>This is</p>
+<em>
+<p>true</p>
+</em>
+<p>markdown text. (par)</p>
+</td>
 </tr>
 </table>
 *** Output of to_latex ***

vendor/plugins/maruku/spec/block_docs/links.md

@@ -102,7 +102,7 @@ md_el(:document,[
 <p>If all else fails, ask <a href="http://www.google.com">Google</a></p>
 
 <p>And now <a href="http://images.google.com" title="Google images">reference-style link ID with spaces</a></p>
-** Output of to_latex ***
+*** Output of to_latex ***
 Search on \href{http://www.google.com}{Google}
 
 Search on \href{http://www.google.com}{Google}