maruku 0.2.9 → 0.2.10

data/lib/maruku/parse_span.rb

@@ -47,14 +47,16 @@ class Maruku
 		# search for ``code`` markers
 		span.match_couple_of('``') { |children, match1, match2| 
 			e = create_md_element(:inline_code)
-			e.meta[:raw_code] = children.join('') # this is now opaque to processing
+			# this is now opaque to processing
+			e.meta[:raw_code] = children.join('').it_was_a_code_block
 			e
 		}
 
 		# Search for `single tick`  code markers
 		span.match_couple_of('`') { |children, match1, match2|
 			e = create_md_element(:inline_code)
-			e.meta[:raw_code] = children.join('').unescape_md_special 
+			# this is now opaque to processing
+			e.meta[:raw_code] = children.join('').it_was_a_code_block
 			# this is now opaque to processing
 			e
 		}
@@ -167,11 +169,13 @@ class Maruku
 			" # closing
 			}x
 		
-		# (http://www.google.com "Google.com"), (http://www.google.com),
+		# [bah](http://www.google.com "Google.com"), 
+		# [bah](http://www.google.com),
+		# [empty]()
 		reg_url_and_title = %r{
 			\(  # opening
 			\s* # whitespace 
-			#{reg_url}  # url = 1 
+			#{reg_url}?  # url = 1 might be  empty
 			(?:\s+["'](.*)["'])? # optional title  = 2
 			\s* # whitespace 
 			\) # closing
@@ -234,6 +238,7 @@ class Maruku
 		}
 
 		# Detect any link with immediate url: [Google](http://www.google.com)
+		# XXX Note that the url can be empty: [Empty]()
 		# a dummy ref is created and put in the symbol table
 		span.match_couple_of('[',  # opening bracket
 				%r{\]                   # closing bracket
@@ -265,6 +270,13 @@ class Maruku
 
 
 		# And now the easy stuff
+
+		# search for ***strong and em***
+		span.match_couple_of('***') { |children,m1,m2|  
+			create_md_element(:strong, [create_md_element(:emphasis, children)] ) }
+
+		span.match_couple_of('___') { |children,m1,m2|  
+			create_md_element(:strong, [create_md_element(:emphasis, children)] ) }
 	
 		# search for **strong**
 		span.match_couple_of('**') { |children,m1,m2|  create_md_element(:strong,   children) }

data/lib/maruku/string_utils.rb

@@ -193,7 +193,7 @@ class Maruku
 		# line that were mistaken for raw_html
 		return :text if l=~EMailAddress or l=~ URL
 		return :raw_html if l =~ %r{^[ ]?[ ]?[ ]?</?\s*\w+}
-		return :ulist    if l =~ /^\s?(\*|-)\s+.*\w+/
+		return :ulist    if l =~ /^\s?([\*-\+])\s+.*\w+/
 		return :olist    if l =~ /^\s?\d\..*\w+/
 		return :empty    if l.strip.size == 0
 		return :header1  if l =~ /^(=)+/ 
@@ -274,16 +274,16 @@ class Maruku
 end
 
 class String
-	S = 240
+	S = 230
 	MarkdownEscaped = 
-		[["\\",S+0],
+		[["\\",S+0], 
 		 ['`',S+1],
 		 ['*',S+2],
 		['_',S+3],['{',S+4],['}',S+5],['[',S+6],[']',S+7],
 		['(',S+8],[')',S+9],['#',S+10],['.',S+11],
 		['!',S+12],
 		# PHP Markdown extra
-		['|',S+13],[':',S+14]]
+		['|',S+13],[':',S+14], ["+",S+15], ["-",S+16], [">",S+17]]
 
 	MarkdownAdd = 200
 	
@@ -314,6 +314,23 @@ class String
 		end
 		self
 	end
+
+	def it_was_a_code_block
+		s = ""; tmp =" "
+		each_byte do |b|
+			tmp[0] = b
+			found = false
+			for e in MarkdownEscaped
+				if b == e[1]
+					s << '\\'
+					s << e[0]
+					found = true
+				end
+			end
+			s << tmp if not found
+		end
+		s
+	end
 	
 	def unescape_md_special; dup.unescape_md_special! end
 	def   escape_md_special; dup.  escape_md_special! end

data/lib/maruku/version.rb

@@ -17,7 +17,7 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class Maruku
-	Version = '0.2.9'
+	Version = '0.2.10'
 	
 	MarukuURL = 'http://maruku.rubyforge.org/'
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: maruku
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
-date: 2006-12-27 00:00:00 +01:00
+  version: 0.2.10
+date: 2006-12-28 00:00:00 +01:00
 summary: A Markdown interpreter in Ruby
 require_paths: 
 - lib