다시 고침

set_mark/end.py

@@ -13,6 +13,8 @@ def end(data, category):
     data = re.sub('<\/blockquote>(?:(?:\r)?\n)<br><blockquote>', '</blockquote><blockquote>', data)
 
     data = re.sub('\n', '<br>', data)
+    data = re.sub("\[br\]", '<br>', data)
+
     data = re.sub('<br><ul id="list">', '<ul id="list">', data)
     data = re.sub('<\/ul>\r<br>', '</ul>', data)
     data = re.sub('<\/table>\r<br><ul ', '</table><ul ', data)

set_mark/indent.py

@@ -2,7 +2,7 @@ import re
 
 def indent(data):
     while 1:
-        m = re.search("(\n(?:(?:( *)\* ?(?:[^\n]*))\n?)+)", data)
+        m = re.search("(\n(?:(?:( *)\* ?(?:((?!\n|\|\|).)*))\n?)+)", data)
         if m:
             end = m.groups()[0]
 
@@ -20,7 +20,13 @@ def indent(data):
                     break
 
             end = re.sub("\n", '', end)
-            data = re.sub("(\n(?:(?:( *)\* ?(?:[^\n]*))\n?)+)", '\r\n<ul style="margin-top: 10px; margin-bottom: 10px;" id="list">' + end + '</ul>\r\n', data, 1)
+
+            if re.search(' <\/li>$', end):
+                test = ' '
+            else:
+                test = ''
+
+            data = re.sub("(\n(?:(?:( *)\* ?(?:((?!\n|\|\|).)*))\n?)+)", '<ul style="margin-top: 10px; margin-bottom: 10px;" id="list">' + end + '</ul>' + test, data, 1)
         else:
             break
 

set_mark/macro.py

@@ -40,7 +40,6 @@ def macro(data):
     data = re.sub("\[anchor\((?P<in>[^\[\]]*)\)\]", '<span id="\g<in>"></span>', data)          
     data = re.sub("\[nicovideo\((?P<in>[^,)]*)(?:(?:,(?:[^,)]*))+)?\)\]", "[[http://embed.nicovideo.jp/watch/\g<in>]]", data)
     data = re.sub('\[ruby\((?P<in>[^\,]*)\,\s?(?P<out>[^\)]*)\)\]', '<ruby>\g<in><rp>(</rp><rt>\g<out></rt><rp>)</rp></ruby>', data)
-    data = re.sub("\[br\]", '<br>', data)
     
     while 1:
         com = re.compile("\[(youtube|kakaotv)\(([^, )]*)(,[^)]*)?\)\]")