better regexps for parsing DIV frames

git-svn-id: svn://rubyforge.org/var/svn/maruku/trunk@193 7e2f57f0-5a75-4fd6-9797-5817c466b243
outcassed · Dec 13, 2008 · 939ce35 · 939ce35
1 parent 22ea7d4
commit 939ce35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -5,6 +5,7 @@ Code and patches from:
 * Paul Dlug
 * [Ari Stern](http://www.acm.caltech.edu/~astern)
 * Damir Zekic (z3c)
+* Alexandr Mankuta (cheba)
 
 Bug reporting, feature requests and praise:
 

diff --git a/lib/maruku/ext/div.rb b/lib/maruku/ext/div.rb
@@ -10,8 +10,8 @@
 #| +--------------------------------------------------
 #+---------------------------------------------------
 
-OpenDiv = /^[ ]{0,3}\+\-\-+\s*([^\s-]*)\s*\-*\s*$/
-CloseDiv = /^[ ]{0,3}\=\-\-+\s*([^\s-]*)\s*\-*\s*$/
+OpenDiv = /^[ ]{0,3}\+\-\-+\s*(\{([^{}]*|".*"|'.*')*\})?\s*\-*\s*$/
+CloseDiv = /^[ ]{0,3}\=\-\-+\s*(\{([^{}]*|".*"|'.*')*\})?\s*\-*\s*$/
 # note these are not enough for parsing the above example:
 #OpenDiv = /^[ ]{0,3}\+\-\-+\s*(.*)$/
 #CloseDiv = /^[ ]{0,3}\=\-\-+\s*(.*)$/