From 53751a61f05108406967e13827533c11bc448fc6 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Mon, 9 Feb 2009 22:20:34 -0600
Subject: [PATCH] Fix Maruku Hanging Bug

A Maruku-syntax <div> with an unclosed IAL (and, it seems, at least one equation)
would cause Instiki to hang. Badly. Requiring a 'kill -9' to terminate it.
Reverting the OpenDiv and CloseDiv Regexps to my, more simple-minded, versions
fixes the problem.
---
 app/views/svg_logo.html.erb                 | 14 +++++------
 vendor/plugins/maruku/lib/maruku/ext/div.rb | 27 +++++++++++++++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app/views/svg_logo.html.erb b/app/views/svg_logo.html.erb
index 012fd66f..31448972 100644
--- a/app/views/svg_logo.html.erb
+++ b/app/views/svg_logo.html.erb
@@ -1,10 +1,10 @@
 <div id="svg_logo"><svg version="1.0" width="100%" height="100%" viewBox='0 0 180 197' xmlns='http://www.w3.org/2000/svg'>
-      <path fill="#<%= @web ? @web.color : "393" %>" stroke-width='0.2' stroke='#000' d='
+      <path fill="#<%= @web ? @web.color : "393" %>" stroke-width='0.5' stroke='#000' d='
         M170,60c4,11-1,20-12,25c-9,4-25,3-20,15c5,5,15,0,24,1c11,1,21,11,14,21c-10,15-35,6-48-1c-5-3-27-23-32-10c-1,13,15,10,22,16
-		c11,4,24,14,34,20c12,10,7,25-9,23c-11-1-22-9-30-16c-5-5-13-18-21-9c-2,6,2,11,5,14c9,9,22,14,22,31c-2,8-12,8-18,4c-4-3-9-8-11-13
-		c-3-6-5-18-12-18c-14-1-5,28-18,30c-9,2-13-9-12-16c1-14,12-24,21-31c5-4,17-13,10-20c-9-10-19,12-23,16c-7,7-17,16-31,15
-		c-9-1-18-9-11-17c5-7,14-4,23-6c6-1,15-8,8-15c-5-6-57,2-42-24c7-12,51,4,61,6c6,1,17,4,18-4c2-11-12-7-21-8c-21-2-49-14-49-34
-		c0-5,3-11,8-11C31,42,34,65,42,67c6,1,9-3,8-9C49,49,38,40,40,25c1-5,4-15,13-14c10,2,11,18,13,29c1,8,0,24,7,28c15,0,5-22,4-30
-		C74,23,78,7,87,1c8-4,14,1,16,9c2,11-8,21-2,30c8,2,11-6,14-12c9-14,36-18,30,5c-3,9-12,19-21,24c-6,4-22,10-23,19c-2,14,15,2,18-2
-		c9-9,20-18,33-22C159,52,166,54,170,60' />
+        c11,4,24,14,34,20c12,10,7,25-9,23c-11-1-22-9-30-16c-5-5-13-18-21-9c-2,6,2,11,5,14c9,9,22,14,22,31c-2,8-12,8-18,4c-4-3-9-8-11-13
+        c-3-6-5-18-12-18c-14-1-5,28-18,30c-9,2-13-9-12-16c1-14,12-24,21-31c5-4,17-13,10-20c-9-10-19,12-23,16c-7,7-17,16-31,15
+        c-9-1-18-9-11-17c5-7,14-4,23-6c6-1,15-8,8-15c-5-6-57,2-42-24c7-12,51,4,61,6c6,1,17,4,18-4c2-11-12-7-21-8c-21-2-49-14-49-34
+        c0-5,3-11,8-11C31,42,34,65,42,67c6,1,9-3,8-9C49,49,38,40,40,25c1-5,4-15,13-14c10,2,11,18,13,29c1,8,0,24,7,28c15,0,5-22,4-30
+        C74,23,78,7,87,1c8-4,14,1,16,9c2,11-8,21-2,30c8,2,11-6,14-12c9-14,36-18,30,5c-3,9-12,19-21,24c-6,4-22,10-23,19c-2,14,15,2,18-2
+        c9-9,20-18,33-22C159,52,166,54,170,60' />
     </svg></div>
\ No newline at end of file
diff --git a/vendor/plugins/maruku/lib/maruku/ext/div.rb b/vendor/plugins/maruku/lib/maruku/ext/div.rb
index 87f4d2f7..efb4e60b 100644
--- a/vendor/plugins/maruku/lib/maruku/ext/div.rb
+++ b/vendor/plugins/maruku/lib/maruku/ext/div.rb
@@ -10,11 +10,28 @@
 #| +--------------------------------------------------
 #+---------------------------------------------------
 
-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*(.*)$/
+## These cause Instiki to hang when it encounters
+##
+##   +-- 
+##   ###### Definition
+##   A _Froelicher Space_ is a triple $(X,C_X,F_X)$ 
+##   =-- {: .num_defn #FroelicherSpace
+##
+## or
+##
+##   +-- {: .num_defn #FroelicherSpace
+##   ###### Definition
+##   A _Froelicher Space_ is a triple $(X,C_X,F_X)$ 
+##   =--
+#
+#OpenDiv = /^[ ]{0,3}\+\-\-+\s*(\{([^{}]*|".*"|'.*')*\})?\s*\-*\s*$/
+#CloseDiv = /^[ ]{0,3}\=\-\-+\s*(\{([^{}]*|".*"|'.*')*\})?\s*\-*\s*$/
+#
+## note these are not enough for parsing the above example:
+## (but they don't produce a hang ...)
+#
+OpenDiv = /^[ ]{0,3}\+\-\-+\s*(.*)$/
+CloseDiv = /^[ ]{0,3}\=\-\-+\s*(.*)$/
 StartPipe = /^[ ]{0,3}\|(.*)$/ # $1 is rest of line
 DecorativeClosing = OpenDiv