From 4ae46b32d8856a0b82bada7c7f9775e6e635e1ad Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sat, 10 Mar 2007 02:06:54 -0600
Subject: [PATCH] Sync with latest maruku.

---
 .../lib/maruku/input/parse_span_better.rb       | 17 +++++++++++------
 .../maruku/lib/maruku/input/type_detection.rb   |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb b/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb
index edfc9e55..1f5e9f41 100644
--- a/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb
+++ b/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb
@@ -197,9 +197,13 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 					end
 				end
 			when ?{ # extension
-				src.ignore_char # {
-				interpret_extension(src, con, [?}])
-				src.ignore_char # }
+				if [?#, ?., ?:].include? src.next_char
+					src.ignore_char # {
+					interpret_extension(src, con, [?}])
+					src.ignore_char # }
+				else
+					con.push_char src.shift_char
+				end
 			when nil
 				maruku_error( ("Unclosed span (waiting for %s"+
 				 "#{exit_on_strings.inspect})") % [
@@ -455,12 +459,13 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 			
 			consumed = 0
 			while true
-				h.eat_this next_stuff[consumed].chr; consumed += 1
-				break if h.is_finished? 
-				
 				if consumed >= next_stuff.size
 					maruku_error "Malformed HTML starting at #{next_stuff.inspect}", src, con
+					break
 				end
+
+				h.eat_this next_stuff[consumed].chr; consumed += 1
+				break if h.is_finished? 
 			end
 			src.ignore_chars(consumed)
 			con.push_element md_html(h.stuff_you_read)
diff --git a/vendor/plugins/maruku/lib/maruku/input/type_detection.rb b/vendor/plugins/maruku/lib/maruku/input/type_detection.rb
index 17a598f6..f4d0c269 100644
--- a/vendor/plugins/maruku/lib/maruku/input/type_detection.rb
+++ b/vendor/plugins/maruku/lib/maruku/input/type_detection.rb
@@ -76,7 +76,7 @@ module MaRuKu; module Strings
 	# $1 = id   $2 = attribute list
 	AttributeDefinitionList = /^\s{0,3}\{([\w\d\s]+)\}:\s*(.*)\s*$/
 	# 
-	InlineAttributeList = /^\s{0,3}\{(.*)\}\s*$/
+	InlineAttributeList = /^\s{0,3}\{([:#\.].*)\}\s*$/
 	# Example:
 	#     ^:blah blah
 	#     ^: blah blah