다시 되돌림

set_mark/end.py

@@ -13,7 +13,6 @@ 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)

set_mark/macro.py

@@ -40,6 +40,7 @@ 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)\(([^, )]*)(,[^)]*)?\)\]")