Merge pull request #426 from 2DU/master

Master

back_reset.py

@@ -17,7 +17,7 @@ curs = conn.cursor()
 
 # 파싱 해주는 함수
 def parser(data):
-    namumark(conn, data[0], data[1], 1, 0, 0)
+    namumark(conn, data[0], data[1], 1)
 
 # 역링크 전부 삭제
 curs.execute("delete from back")

func.py

@@ -48,21 +48,16 @@ def captcha_post(test, conn, num = 1):
                 data = requests.get('https://www.google.com/recaptcha/api/siteverify', params = { 'secret' : sec_re, 'response' : test })
                 if not data:
                     return 0
-
                 else:
                     json_data = data.json()
                     if data.status_code == 200 and json_data['success'] == True:
                         return 0
-
                     else:
                         return 1
-
             else:
                 return 0
-
         else:
             return 0
-
     else:
         pass
 
@@ -74,10 +69,8 @@ def ip_warring(conn):
         data = curs.fetchall()
         if data and data[0][0] != '':
             text_data = '<span>' + data[0][0] + '</span><hr>'
-
         else:
             text_data = '<span>비 로그인 상태입니다. 비 로그인으로 진행 시 아이피가 기록됩니다.</span><hr>'
-
     else:
         text_data = ''
 
@@ -94,14 +87,12 @@ def skin_check(conn):
         if skin_exist and skin_exist[0][0] != '':
             if os.path.exists(os.path.abspath('./views/' + skin_exist[0][0] + '/index.html')) == 1:
                 skin = './views/' + skin_exist[0][0] + '/'
-        
         else:
             curs.execute('select data from other where name = "skin"')
             skin_exist = curs.fetchall()
             if skin_exist:
                 if os.path.exists(os.path.abspath('./views/' + skin_exist[0][0] + '/index.html')) == 1:
                     skin = './views/' + skin_exist[0][0] + '/'
-
     except:
         pass
 
@@ -113,10 +104,8 @@ def next_fix(link, num, page, end = 50):
     if num == 1:
         if len(page) == end:
             list_data += '<hr><a href="' + link + str(num + 1) + '">(이후)</a>'
-
     elif len(page) != end:
         list_data += '<hr><a href="' + link + str(num - 1) + '">(이전)</a>'
-
     else:
         list_data += '<hr><a href="' + link + str(num - 1) + '">(이전)</a> <a href="' + link + str(num + 1) + '">(이후)</a>'
 
@@ -135,15 +124,13 @@ def wiki_set(conn, num):
         db_data = curs.fetchall()
         if db_data and db_data[0][0] != '':
             data_list += [db_data[0][0]]
-
         else:
-            data_list += ['무명위키']
+            data_list += ['Wiki']
 
         curs.execute('select data from other where name = "license"')
         db_data = curs.fetchall()
         if db_data and db_data[0][0] != '':
             data_list += [db_data[0][0]]
-
         else:
             data_list += ['CC 0']
 
@@ -153,7 +140,6 @@ def wiki_set(conn, num):
         db_data = curs.fetchall()
         if db_data and db_data[0][0] != '':
             data_list += [db_data[0][0]]
-
         else:
             data_list += [data_list[0]]
             
@@ -161,17 +147,15 @@ def wiki_set(conn, num):
         db_data = curs.fetchall()
         if db_data and db_data[0][0] != '':
             data_list += [db_data[0][0]]
-
         else:
             data_list += ['']
 
         return data_list
 
     if num == 2:
-        var_data = '위키:대문'
+        var_data = 'FrontPage'
 
         curs.execute('select data from other where name = "frontpage"')
-
     elif num == 3:
         var_data = '2'
 
@@ -180,7 +164,6 @@ def wiki_set(conn, num):
     db_data = curs.fetchall()
     if db_data and db_data[0][0] != '':
         return db_data[0][0]
-
     else:
         return var_data
 
@@ -190,13 +173,10 @@ def diff(seqm):
     for opcode, a0, a1, b0, b1 in seqm.get_opcodes():
         if opcode == 'equal':
             output += [seqm.a[a0:a1]]
-
         elif opcode == 'insert':
             output += ["<span style='background:#CFC;'>" + seqm.b[b0:b1] + "</span>"]
-
         elif opcode == 'delete':
             output += ["<span style='background:#FDD;'>" + seqm.a[a0:a1] + "</span>"]
-
         elif opcode == 'replace':
             output += ["<span style='background:#FDD;'>" + seqm.a[a0:a1] + "</span>"]
             output += ["<span style='background:#CFC;'>" + seqm.b[b0:b1] + "</span>"]
@@ -216,25 +196,18 @@ def admin_check(conn, num, what):
         while 1:
             if num == 1 and reset == 0:
                 check = 'ban'
-
             elif num == 2 and reset == 0:
                 check = 'mdel'
-
             elif num == 3 and reset == 0:
                 check = 'toron'
-
             elif num == 4 and reset == 0:
                 check = 'check'
-
             elif num == 5 and reset == 0:
                 check = 'acl'
-
             elif num == 6 and reset == 0:
                 check = 'hidel'
-
             elif num == 7 and reset == 0:
                 check = 'give'
-
             else:
                 check = 'owner'
 
@@ -248,14 +221,12 @@ def admin_check(conn, num, what):
             else:
                 if reset == 0:
                     reset = 1
-
                 else:
                     break
 
 def ip_pas(conn, raw_ip):
-    hide = 0
-
     curs = conn.cursor()
+    hide = 0
 
     if re.search("(\.|:)", raw_ip):
         if not re.search("^도구:", raw_ip):    
@@ -266,10 +237,8 @@ def ip_pas(conn, raw_ip):
 
                 if not admin_check(conn, 'ban', None):
                     hide = 1
-
             else:
                 ip = raw_ip
-
         else:
             ip = raw_ip
             hide = 1
@@ -277,7 +246,6 @@ def ip_pas(conn, raw_ip):
         curs.execute("select title from data where title = ?", ['사용자:' + raw_ip])
         if curs.fetchall():
             ip = '<a href="/w/' + url_pas('사용자:' + raw_ip) + '">' + raw_ip + '</a>'
-
         else:
             ip = '<a id="not_thing" href="/w/' + url_pas('사용자:' + raw_ip) + '">' + raw_ip + '</a>'
          
@@ -291,7 +259,6 @@ def custom(conn):
 
     if 'MyMaiToNight' in session:
         user_head = session['MyMaiToNight']
-
     else:
         user_head = ''
 
@@ -299,26 +266,27 @@ def custom(conn):
         curs.execute('select name from alarm where name = ? limit 1', [ip_check()])
         if curs.fetchall():
             user_icon = 2
-
         else:
             user_icon = 1
-
     else:
         user_icon = 0
 
-    if user_icon == 1:
+    if user_icon != 0:
         curs.execute('select email from user where id = ?', [ip_check()])
         data = curs.fetchall()
         if data:
             email = data[0][0]
-
         else:
             email = ''
-
     else:
         email = ''
 
-    return ['', '', user_icon, user_head, email]
+    if user_icon != 0:
+        user_name = ip_check()
+    else:
+        user_name = '사용자'
+
+    return ['', '', user_icon, user_head, email, user_name]
 
 def acl_check(conn, name):
     curs = conn.cursor()
@@ -349,7 +317,6 @@ def acl_check(conn, name):
         
         if ip == acl_n[0] and not re.search("(\.|:)", ip) and not re.search("(\.|:)", acl_n[0]):
             return 0
-
         else:
             return 1
 
@@ -439,11 +406,9 @@ def ban_insert(conn, name, end, why, login, blocker):
     if curs.fetchall():
         curs.execute("insert into rb (block, end, today, blocker, why, band) values (?, ?, ?, ?, ?, ?)", [name, '해제', time, blocker, '', band])
         curs.execute("delete from ban where block = ?", [name])
-
     else:
         if login != '':
             login = 'O'
-            
         else:
             login = ''
 
@@ -461,7 +426,6 @@ def rd_plus(conn, title, sub, date):
     curs.execute("select title from rd where title = ? and sub = ?", [title, sub])
     if curs.fetchall():
         curs.execute("update rd set date = ? where title = ? and sub = ?", [date, title, sub])
-
     else:
         curs.execute("insert into rd (title, sub, date) values (?, ?, ?)", [title, sub, date])
 
@@ -472,17 +436,14 @@ def history_plus(conn, title, data, date, ip, send, leng):
     id_data = curs.fetchall()
     if id_data:
         curs.execute("insert into history (id, title, data, date, ip, send, leng) values (?, ?, ?, ?, ?, ?, ?)", [str(int(id_data[0][0]) + 1), title, data, date, ip, send, leng])
-        
     else:
         curs.execute("insert into history (id, title, data, date, ip, send, leng) values ('1', ?, ?, ?, ?, ?, ?)", [title, data, date, ip, send + ' (새 문서)', leng])
 
 def leng_check(first, second):
     if first < second:
         all_plus = '+' + str(second - first)
-
     elif second < first:
         all_plus = '-' + str(first - second)
-
     else:
         all_plus = '0'
         
@@ -522,7 +483,6 @@ def re_error(conn, data):
                         end += '차단이 풀렸습니다. 다시 해보세요.'
                     else:
                         end += '차단 중 : ' + end_data[0][0]
-
                 else:
                     end += '무기한 차단 상태 입니다.'
                 
@@ -543,87 +503,66 @@ def re_error(conn, data):
         if num == 1:
             title = '권한 오류'
             data = '비 로그인 상태 입니다.'
-
         elif num == 2:
             title = '권한 오류'
             data = '이 계정이 없습니다.'
-
         elif num == 3:
             title = '권한 오류'
             data = '권한이 모자랍니다.'
-
         elif num == 4:
             title = '권한 오류'
             data = '관리자는 차단, 검사 할 수 없습니다.'
-
         elif num == 5:
             title = '사용자 오류'
             data = '그런 계정이 없습니다.'
-
         elif num == 6:
             title = '가입 오류'
             data = '동일한 아이디의 사용자가 있습니다.'
-
         elif num == 7:
             title = '가입 오류'
             data = '아이디는 20글자보다 짧아야 합니다.'
-
         elif num == 8:
             title = '가입 오류'
             data = '아이디에는 한글과 알파벳과 공백만 허용 됩니다.'
-
         elif num == 9:
             title = '파일 올리기 오류'
             data = '파일이 없습니다.'
-
         elif num == 10:
             title = '변경 오류'
             data = '비밀번호가 다릅니다.'
-
         elif num == 11:
             title = '로그인 오류'
             data = '이미 로그인 되어 있습니다.'
-
         elif num == 13:
             title = '리캡차 오류'
             data = '리캡차를 통과하세요.'
-
         elif num == 14:
             title = '파일 올리기 오류'
             data = 'jpg, gif, jpeg, png, webp만 가능 합니다.'
-
         elif num == 15:
             title = '편집 오류'
             data = '편집 기록은 500자를 넘을 수 없습니다.'
-
         elif num == 16:
             title = '파일 올리기 오류'
             data = '동일한 이름의 파일이 있습니다.'
-
         elif num == 17:
             title = '파일 올리기 오류'
             data = '파일 용량은 ' + wiki_set(conn, 3) + 'MB를 넘길 수 없습니다.'
-
         elif num == 18:
             title = '편집 오류'
             data = '내용이 원래 문서와 동일 합니다.'
-
         elif num == 19:
             title = '이동 오류'
             data = '이동 하려는 곳에 문서가 이미 있습니다.'
-
         elif num == 20:
             title = '비밀번호 오류'
             data = '재 확인이랑 비밀번호가 다릅니다.'
-
         elif num == 21:
             title = '편집 오류'
             data = '편집 필터에 의해 검열 되었습니다.'
-
         elif num == 22:
             title = '파일 올리기 오류'
             data = '파일 이름은 알파벳, 한글, 띄어쓰기, 언더바, 빼기표만 허용 됩니다.'
-
         else:
             title = '정체 불명의 오류'
             data = '???'
@@ -634,9 +573,7 @@ def re_error(conn, data):
                 data = '<h2>오류 발생</h2><ul><li>' + data + '</li></ul>',
                 menu = 0
             ))
-
         else:
             return redirect('/')
-
     else:
         return redirect('/')

language/ko-KR.json

@@ -0,0 +1,16 @@
+{
+    "edit" : "편집",
+    "history" : "역사",
+    "move" : "이동",
+    "hide" : "숨김",
+    "list" : "목록",
+    "revert" : "되돌리기",
+    "version" : "판",
+    "document" : "문서",
+    "all" : "모든",
+    "ban" : "차단",
+    "admin" : "관리자",
+    "release" : "해제",
+    "user_css_warring" : "비 로그인의 경우에는 사용자 CSS가 로그인하거나 브라우저 닫으면 날아갑니다.",
+    "http_warring" : "주의 : 만약 HTTPS 연결이 아닌 경우 데이터가 유출될 가능성이 있습니다. 이에 대해 책임지지 않습니다."
+}

set_mark/start.py

@@ -14,17 +14,22 @@ def table_parser(data, cel_data, start_data, num = 0):
 
     table_width = re.search("<table ?width=((?:(?!>).)*)>", data)
     if table_width:
-        all_table += 'width: ' + table_width.groups()[0] + 'px;'
+        if re.search('^[0-9]+$', table_width.groups()[0]):
+            all_table += 'width: ' + table_width.groups()[0] + 'px;'
+        else:
+            all_table += 'width: ' + table_width.groups()[0] + ';'
     
     table_height = re.search("<table ?height=((?:(?!>).)*)>", data)
     if table_height:
-        all_table += 'height: ' + table_height.groups()[0] + 'px;'
+        if re.search('^[0-9]+$', table_height.groups()[0]):
+            all_table += 'height: ' + table_height.groups()[0] + 'px;'
+        else:
+            all_table += 'height: ' + table_height.groups()[0] + ';'
     
     table_align = re.search("<table ?align=((?:(?!>).)*)>", data)
     if table_align:
         if table_align.groups()[0] == 'right':
             all_table += 'float: right;'
-
         elif table_align.groups()[0] == 'center':
             all_table += 'margin: auto;'
             
@@ -34,7 +39,6 @@ def table_parser(data, cel_data, start_data, num = 0):
 
         if table_text_align.groups()[0] == 'right':
             all_table += 'text-align: right;'
-
         elif table_text_align.groups()[0] == 'center':
             all_table += 'text-align: center;'
 
@@ -42,17 +46,14 @@ def table_parser(data, cel_data, start_data, num = 0):
     if row_table_align:
         if row_table_align.groups()[0] == 'right':
             row_style += 'text-align: right;'
-
         elif row_table_align.groups()[0] == 'center':
             row_style += 'text-align: center;'
-
         else:
             row_style += 'text-align: left;'
     
     table_cel = re.search("<-((?:(?!>).)*)>", data)
     if table_cel:
         cel = 'colspan="' + table_cel.groups()[0] + '"'
-
     else:
         cel = 'colspan="' + str(round(len(start_data) / 2)) + '"'   
 
@@ -89,20 +90,15 @@ def table_parser(data, cel_data, start_data, num = 0):
     text_left = re.search("<\(>",  data)
     if text_right:
         cel_style += 'text-align: right;'
-
     elif text_center:
         cel_style += 'text-align: center;'
-
     elif text_left:
         cel_style += 'text-align: left;'
-
     elif num == 0:
         if re.search('^ (.*) $', cel_data):
             cel_style += 'text-align: center;'
-
         elif re.search('^ (.*)$', cel_data):
             cel_style += 'text-align: right;'
-
         elif re.search('^(.*) $', cel_data):
             cel_style += 'text-align: left;'
 
@@ -137,7 +133,6 @@ def start(conn, data, title):
             include_data = re.search('^((?:(?!,).)+)', include)
             if include_data:
                 include_data = include_data.groups()[0]
-
             else:
                 include_data = 'Test'
 
@@ -166,160 +161,164 @@ def start(conn, data, title):
                 include_parser = html.escape(include_parser)
 
                 data = re.sub('\[include\(((?:(?!\)\]).)+)\)\]', '\n' + include_parser + '\n', data, 1)
-
             else:
                 data = re.sub('\[include\(((?:(?!\)\]).)+)\)\]', '<a id="not_thing" href="/w/' + tool.url_pas(include_link) + '">' + include_link + '</a>', data, 1)
-
         else:
             break
 
     # 개행 정리
     data = re.sub('\r\n', '\n', data)
 
+    # 기타 처리
+    data = re.sub('&amp;', '&', data)
+
+    # HTML 허용
+    src_list = ["www.youtube.com", "serviceapi.nmv.naver.com", "tv.kakao.com", "www.google.com", "serviceapi.rmcnmv.naver.com"]
+    html_list = ['div', 'span', 'embed', 'iframe', 'ruby', 'rp', 'rt']
+
+    html_data = re.findall('&lt;(\/)?((?:(?!&gt;| ).)+)( (?:(?:(?!&gt;).)+)?)?&gt;', data)
+    for in_data in html_data:
+        if in_data[0] == '':
+            if in_data[1] in html_list:
+                if re.search('&lt;\/' + in_data[1] + '&gt;', data):
+                    src = re.search('src=([^ ]*)', in_data[2])
+                    if src:
+                        v_src = re.search('http(?:s)?:\/\/([^/\'" ]*)', src.groups()[0])
+                        if v_src:
+                            if not v_src.groups()[0] in src_list:
+                                and_data = re.sub('&#x27;', '\'', re.sub('&quot;', '"', re.sub('src=([^ ]*)', '', in_data[2])))
+                            else:
+                                and_data = re.sub('&#x27;', '\'', re.sub('&quot;', '"', in_data[2]))
+                        else:
+                            and_data = re.sub('&#x27;', '\'', re.sub('&quot;', '"', re.sub('src=([^ ]*)', '', in_data[2])))
+                    else:
+                        and_data = re.sub('&#x27;', '\'', re.sub('&quot;', '"', in_data[2]))
+
+                    data = re.sub('&lt;' + in_data[1] + in_data[2] + '&gt;', '<' + in_data[1] + and_data + '>', data, 1)
+                    data = re.sub('&lt;\/' + in_data[1] + '&gt;', '</' + in_data[1] + '>', data, 1)
+
+    position = re.compile('position', re.I)
+    data = position.sub('', data)
+
     # 표 정리
     data = re.sub('\n( +)\|\|', '\n||', data)
     data = re.sub('\|\|( +)\n', '||\n', data)
 
+    # 주석 처리
+    data = re.sub('\n##(((?!\n).)+)', '', data)
+
     # 중괄호 문법 처리
     middle_stack = 0
     middle_list = []
     middle_number = 0
     while 1:
-        middle_data = re.search('(?:{{{((?:(?! |{{{).)*)|(}}}))', data)
+        middle_data = re.search('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', data)
         if middle_data:
             middle_data = middle_data.groups()
-            if not middle_data[1]:
+            if middle_data[0]:
                 if middle_stack > 0:
                     middle_stack += 1
                     
-                    data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '&#123;&#123;&#123;' + middle_data[0], data, 1)
-
+                    data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '&#123;&#123;&#123;' + middle_data[0], data, 1)
                 else:
-                    check = 0
-                    if check == 0:
+                    if middle_data[0] != '':
                         middle_search = re.search('^(#(?:[0-9a-f-A-F]{3}){1,2})', middle_data[0])
-                        if middle_search:
-                            check = 1
-                            
-                            middle_search = middle_search.groups()[0]
-                            
+                        if middle_search:                            
                             middle_list += ['span']
                             
-                            data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<span style="color: ' + middle_search + ';">', data, 1)
-                        
-                        middle_search = re.search('^(?:#(\w+))', middle_data[0])
-                        if middle_search:
-                            check = 1
-                            
-                            middle_search = middle_search.groups()[0]
-                            
-                            middle_list += ['span']
-                            
-                            data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<span style="color: ' + middle_search + ';">', data, 1)
-
-                        middle_search = re.search('^(?:@((?:[0-9a-f-A-F]{3}){1,2}))', middle_data[0])
-                        if middle_search:
-                            check = 1
-                            
-                            middle_search = middle_search.groups()[0]
-                            
-                            middle_list += ['span']
-                            
-                            data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<span style="background: #' + middle_search + ';">', data, 1)
-                        
-                        middle_search = re.search('^(?:@(\w+))', middle_data[0])
-                        if middle_search:
-                            check = 1
-                            
-                            middle_search = middle_search.groups()[0]
-                            
-                            middle_list += ['span']
-                            
-                            data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<span style="background: ' + middle_search + ';">', data, 1)
-
-                        middle_search = re.search('^(\+|-)([1-5])', middle_data[0])
-                        if middle_search:
-                            check = 1
-                            
-                            middle_search = middle_search.groups()
-                            if middle_search[0] == '+':
-                                font_size = str(int(middle_search[1]) * 20 + 100)
+                            data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span style="color: ' + middle_search.groups()[0] + ';">', data, 1)
+                        else:
+                            middle_search = re.search('^(?:#(\w+))', middle_data[0])
+                            if middle_search:
+                                middle_list += ['span']
+                                
+                                data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span style="color: ' + middle_search.groups()[0] + ';">', data, 1)
                             else:
-                                font_size = str(100 - int(middle_search[1]) * 10)
-
-                            middle_list += ['span']
-                            
-                            data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<span style="font-size: ' + font_size + '%;">', data, 1)
-
-                        middle_search = re.search('^#!wiki', middle_data[0])
-                        if middle_search:
-                            check = 1
-        
-                            middle_data_2 = re.search('{{{#!wiki style=(?:&quot;|&#x27;)((?:(?!&quot;|&#x27;).)*)(?:&quot;|&#x27;)\n', data)
-                            middle_data_2 = middle_data_2.groups()
-
-                            middle_list += ['div']
-                            
-                            data = re.sub('{{{#!wiki style=(?:&quot;|&#x27;)((?:(?!&quot;|&#x27;).)*)(?:&quot;|&#x27;)\n', '<div style="' + middle_data_2[0] + '">', data, 1)
-
-                        middle_search = re.search('^#!syntax', middle_data[0])
-                        if middle_search:
-                            check = 1
-        
-                            middle_data_2 = re.search('{{{#!syntax ((?:(?!\n).)+)\n', data)
-                            middle_data_2 = middle_data_2.groups()
-
-                            middle_list += ['code', 'pre']
-                            middle_number += 1
-                            
-                            data = re.sub('{{{#!syntax ((?:(?!\n).)+)\n', '<pre id="syntax"><code class="' + middle_data_2[0] + '">', data, 1)
-
-                        middle_search = re.search('^#!html', middle_data[0])
-                        if middle_search:
-                            check = 1
-
-                            middle_list += ['span']
-                            
-                            data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<span>', data, 1)
-
-                        middle_search = re.search('^#!folding', middle_data[0])
-                        if middle_search:
-                            check = 1
-
-                            middle_list += ['span']
-                            
-                            data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<span>', data, 1)
-
-                    if not check == 1:
+                                middle_search = re.search('^(?:@((?:[0-9a-f-A-F]{3}){1,2}))', middle_data[0])
+                                if middle_search:
+                                    middle_list += ['span']
+                                    
+                                    data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span style="background: #' + middle_search.groups()[0] + ';">', data, 1)
+                                else:
+                                    middle_search = re.search('^(?:@(\w+))', middle_data[0])
+                                    if middle_search:
+                                        middle_list += ['span']
+                                        
+                                        data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span style="background: ' + middle_search.groups()[0] + ';">', data, 1)
+                                    else:
+                                        middle_search = re.search('^(\+|-)([1-5])', middle_data[0])
+                                        if middle_search:
+                                            middle_search = middle_search.groups()
+                                            if middle_search[0] == '+':
+                                                font_size = str(int(middle_search[1]) * 20 + 100)
+                                            else:
+                                                font_size = str(100 - int(middle_search[1]) * 10)
+
+                                            middle_list += ['span']
+                                            
+                                            data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span style="font-size: ' + font_size + '%;">', data, 1)
+                                        else:
+                                            middle_search = re.search('^#!wiki', middle_data[0])
+                                            if middle_search:
+                                                middle_data_2 = re.search('{{{#!wiki style=(?:&quot;|&#x27;)((?:(?!&quot;|&#x27;).)*)(?:&quot;|&#x27;)\n', data)
+                                                middle_data_2 = middle_data_2.groups()
+
+                                                middle_list += ['div']
+                                                
+                                                data = re.sub('{{{#!wiki style=(?:&quot;|&#x27;)((?:(?!&quot;|&#x27;).)*)(?:&quot;|&#x27;)\n', '<div style="' + middle_data_2[0] + '">', data, 1)
+                                            else:
+                                                middle_search = re.search('^#!syntax', middle_data[0])
+                                                if middle_search:
+                                                    middle_data_2 = re.search('{{{#!syntax ((?:(?!\n).)+)\n', data)
+                                                    middle_data_2 = middle_data_2.groups()
+
+                                                    middle_list += ['code', 'pre']
+                                                    middle_number += 1
+                                                    
+                                                    data = re.sub('{{{#!syntax ((?:(?!\n).)+)\n', '<pre id="syntax"><code class="' + middle_data_2[0] + '">', data, 1)
+                                                else:
+                                                    middle_search = re.search('^#!html', middle_data[0])
+                                                    if middle_search:
+                                                        middle_list += ['span']
+                                                        
+                                                        data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span>', data, 1)
+                                                    else:
+                                                        middle_search = re.search('^#!folding', middle_data[0])
+                                                        if middle_search:
+                                                            middle_list += ['span']
+                                                            
+                                                            data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span>', data, 1)
+                                                        else:
+                                                            middle_list += ['span']
+
+                                                            data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '<span>', data, 1)
+                    else:
                         middle_list += ['code']
                         
                         middle_stack += 1
                         
-                        data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '<code>' + middle_data[0], data, 1)
+                        data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*)|(}}}))', '<code>' + middle_data[0], data, 1)
                 
                     middle_number += 1
-
             else:
                 if middle_stack > 0:
                     middle_stack -= 1
 
                 if middle_stack > 0:
-                    data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '&#125;&#125;&#125;', data, 1)
-
+                    data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '&#125;&#125;&#125;', data, 1)
                 else:
                     if middle_number > 0:
                         middle_number -= 1
 
                     if middle_list[middle_number] == 'pre':
-                        data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '</code></pre>', data, 1)
+                        data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '</code></pre>', data, 1)
 
                         del(middle_list[middle_number])
                         middle_number -= 1
                     else:
-                        data = re.sub('(?:{{{((?:(?! |{{{).)*)|(}}}))', '</' + middle_list[middle_number] + '>', data, 1)
+                        data = re.sub('(?:{{{((?:(?! |{{{|}}}).)*) ?|(}}}))', '</' + middle_list[middle_number] + '>', data, 1)
                     
                     del(middle_list[middle_number])
-
         else:
             break
 
@@ -335,35 +334,24 @@ def start(conn, data, title):
 
             num += 1
 
-            plus_data += '<script>function func_nowiki_' + str(num) + '() { document.all("nowiki_' + str(num) + '").innerHTML = "' + nowiki_data[0] + '"; }</script>'
-
-            data = re.sub('<code>((?:(?:(?!<\/code>).)+\n*)+)<\/code>', '<a href="javascript:void(0);" onclick="func_nowiki_' + str(num) + '();" id="nowiki_' + str(num) + '">(NoWiki 보기)</a>', data, 1)
+            plus_data += '<script>function func_nowiki_' + str(num) + '() { document.all("nowiki_' + str(num) + '").innerHTML = "' + re.sub('\n', '\\\\n', nowiki_data[0]) + '"; } func_nowiki_' + str(num) + '();</script>'
 
+            data = re.sub('<code>((?:(?:(?!<\/code>).)+\n*)+)<\/code>', '<span id="nowiki_' + str(num) + '">(NoWiki Error)</span>', data, 1)
         else:
             break
 
     # Syntax 처리
+    num = 0
     while 1:
-        syntax_data = re.search('<code class="((?:(?!").)+)">((?:(?:(?!<\/code>|<span id="space">)(\n( +)).)+\n*)+)<\/code>', data)
+        syntax_data = re.search('<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>|<span id="syntax_)).)+\n*)+)<\/code>', data)
         if syntax_data:
             syntax_data = syntax_data.groups()
 
-            syntax_data_replace = syntax_data[1]
-
-            while 1:
-                syntax_space = re.search('\n( +)', syntax_data_replace)
-                if syntax_space:
-                    syntax_space = syntax_space.groups()
-
-                    space_len = '\n<span id="space">' + syntax_space[0] + '</span>'
-
-                    syntax_data_replace = re.sub('\n( +)', space_len, syntax_data_replace, 1)
+            num += 1
 
-                else:
-                    break             
+            plus_data += '<script>function func_syntax_' + str(num) + '() { document.all("syntax_' + str(num) + '").innerHTML = "' + re.sub('\n', '\\\\n', syntax_data[1]) + '"; } func_syntax_' + str(num) + '();</script>'
 
-            data = re.sub('<code class="((?:(?!").)+)">((?:(?:(?!<\/code>|<span id="space">)(\n( +)).)+\n*)+)<\/code>', '<code class="' + syntax_data[0] + '">' + syntax_data_replace + '</code>', data, 1)
-        
+            data = re.sub('<code class="((?:(?!").)+)">((?:(?:(?:(?!<\/code>|<span id="syntax_)).)+\n*)+)<\/code>', '<code class="' + syntax_data[0] + '"><span id="syntax_' + str(num) + '">(Syntax Error)</span></code>', data, 1)
         else:
             break
 
@@ -382,7 +370,6 @@ def start(conn, data, title):
             data = re.sub('&lt;math&gt;((?:(?!&lt;\/math&gt;).)+)&lt;\/math&gt;', '<span id="math_' + str(first) + '"></span>', data, 1)
 
             plus_data += '<script>katex.render("' + math.replace('\\', '\\\\') +'", document.getElementById("math_' + str(first) + '"));</script>'
-        
         else:
             break
 
@@ -395,7 +382,7 @@ def start(conn, data, title):
     data = re.sub('~~(?P<in>(?:(?!~~).)+)~~', '<s>\g<in></s>', data)
     data = re.sub('--(?P<in>(?:(?!~~).)+)--', '<s>\g<in></s>', data)
     data = re.sub('__(?P<in>(?:(?!__).)+)__', '<u>\g<in></u>', data)
-    data = re.sub('^^(?P<in>(?:(?!^^).)+)^^', '<sup>\g<in></sup>', data)
+    data = re.sub('\^\^(?P<in>(?:(?!\^\^).)+)\^\^', '<sup>\g<in></sup>', data)
     data = re.sub(',,(?P<in>(?:(?!,,).)+),,', '<sub>\g<in></sub>', data)
 
     # 넘겨주기 변환
@@ -407,7 +394,6 @@ def start(conn, data, title):
             backlink += [[title, redirect, 'redirect']]
             
             data = re.sub('\n#(?:redirect|넘겨주기) (?P<in>(?:(?!\n).)+)\n', '<meta http-equiv="refresh" content="0; url=/w/\g<in>?froms=' + tool.url_pas(title) + '">', data, 1)
-
         else:
             break
 
@@ -415,7 +401,6 @@ def start(conn, data, title):
     if not re.search('\[목차\(없음\)\]\n', data):
         if not re.search('\[목차\]', data):
             data = re.sub('\n(?P<in>={1,6}) ?(?P<out>(?:(?!=).)+) ?={1,6}\n', '\n[목차]\n\g<in> \g<out> \g<in>\n', data, 1)
-
     else:
         data = re.sub('\[목차\(없음\)\]\n', '', data)
 
@@ -455,7 +440,6 @@ def start(conn, data, title):
             data = re.sub('\n(={1,6}) ?((?:(?!=).)+) ?={1,6}\n', '\n<h' + toc_number + ' id="s-' + re.sub('\.$', '', all_stack) + '"><a href="#toc">' + all_stack + '</a> ' + toc[1] + ' <span style="font-size: 12px"><a href="/edit/' + tool.url_pas(title) + '?section=' + str(edit_number) + '">(편집)</a></span></h' + toc_number + '>\n', data, 1)
             
             toc_data += '<span style="margin-left: ' + str((toc_full - toc_top_stack) * 10) + 'px;"><a href="#s-' + re.sub('\.$', '', all_stack) + '">' + all_stack + '</a> ' + toc[1] + '</span>\n'
-        
         else:
             break
 
@@ -467,7 +451,6 @@ def start(conn, data, title):
         hr = re.search('\n-{4,9}\n', data)
         if hr:
             data = re.sub('\n-{4,9}\n', '\n<hr>\n', data, 1)
-        
         else:
             break
 
@@ -476,7 +459,6 @@ def start(conn, data, title):
     # 일부 매크로 처리
     data = tool.savemark(data)
     
-    data = re.sub("\[br\]", '\n', 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>|\g<in>]]", data)
     data = re.sub('\[ruby\((?P<in>(?:(?!,).)+)\, ?(?P<out>(?:(?!\)\]).)+)\)\]', '<ruby>\g<in><rp>(</rp><rt>\g<out></rt><rp>)</rp></ruby>', data)
@@ -507,7 +489,6 @@ def start(conn, data, title):
         
         if re.search('^-', str(e_data.days)):
             e_day = str(e_data.days)
-
         else:
             e_day = '+' + str(e_data.days)
 
@@ -522,25 +503,21 @@ def start(conn, data, title):
             width = re.search(', ?width=((?:(?!,).)+)', video[1])
             if width:
                 video_width = width.groups()[0]
-
             else:
                 video_width = '560'
             
             height = re.search(', ?height=((?:(?!,).)+)', video[1])
             if height:
                 video_height = height.groups()[0]
-
             else:
                 video_height = '315'
 
             code = re.search('^(((?!,).)+)', video[1])
             if code:
                 video_code = code.groups()[0]
-
             else:
                 if video[0] == 'youtube':
                     video_code = 'BQ5PcIUcdUE'
-
                 else:
                     video_code = '66861302'
 
@@ -549,7 +526,6 @@ def start(conn, data, title):
                 video_code = re.sub('^https:\/\/youtu\.be\/', '', video_code)
                 
                 video_src = 'https://www.youtube.com/embed/' + video_code
-
             else:
                 video_code = re.sub('^https:\/\/tv\.kakao\.com\/channel\/9262\/cliplink\/', '', video_code)
                 video_code = re.sub('^http:\/\/tv\.kakao\.com\/v\/', '', video_code)
@@ -557,7 +533,6 @@ def start(conn, data, title):
                 video_src = 'https://tv.kakao.com/embed/player/cliplink/' + video_code +'?service=kakao_tv'
                 
             data = re.sub('\[(youtube|kakaotv)\(((?:(?!\)\]).)+)\)\]', '<iframe width="' + video_width + '" height="' + video_height + '" src="' + video_src + '" allowfullscreen frameborder="0"></iframe>', data, 1)
-
         else:
             break
 
@@ -572,7 +547,6 @@ def start(conn, data, title):
             block = re.sub('\n$', '', block)
             
             data = re.sub('(\n(?:&gt; ?(?:(?:(?!\n).)+)?\n)+)', '\n<blockquote>' + block + '</blockquote>\n', data, 1)
-
         else:
             break
 
@@ -589,17 +563,14 @@ def start(conn, data, title):
                     # 앞의 공백 만큼 margin 먹임
                     if len(sub_li[0]) == 0:
                         margin = 20
-
                     else:
                         margin = len(sub_li[0]) * 20
 
                     li = re.sub('\n(?:( *)\* ?((?:(?!\n).)+))', '<li style="margin-left: ' + str(margin) + 'px;">' + sub_li[1] + '</li>', li, 1)
-
                 else:
                     break
 
             data = re.sub('(\n(?:(?: *)\* ?(?:(?:(?!\n).)+)\n)+)', '\n\n<ul>' + li + '</ul>\n', data, 1)
-
         else:
             break
 
@@ -613,7 +584,6 @@ def start(conn, data, title):
             margin = '<span style="margin-left: 20px;"></span>' * indent
             
             data = re.sub('\n( +)', '\n' + margin, data, 1)
-
         else:
             break
 
@@ -625,7 +595,7 @@ def start(conn, data, title):
             
             # return [all_table, row_style, cel_style, row, cel, table_class, num]
             while 1:
-                all_table = re.search('^((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)((?:(?!\|\||<\/td>).)+)', table)
+                all_table = re.search('^((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)\n*((?:(?!\|\||<\/td>).)+\n*)', table)
                 if all_table:
                     all_table = all_table.groups()
                     
@@ -633,33 +603,31 @@ def start(conn, data, title):
                     
                     number = return_table[6]
                     
-                    table = re.sub('^((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)', '\n<table ' + return_table[5] + ' ' + return_table[0] + '><tbody><tr ' + return_table[1] + '><td ' + return_table[2] + ' ' + return_table[3] + ' ' + return_table[4] + '>\n', table, 1)
-
+                    table = re.sub('^((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)\n*', '\n<table ' + return_table[5] + ' ' + return_table[0] + '><tbody><tr ' + return_table[1] + '><td ' + return_table[2] + ' ' + return_table[3] + ' ' + return_table[4] + '>\n', table, 1)
                 else:
                     break
 
             table = re.sub('\|\|\n$', '</td></tr></tbody></table>', table)
+
             while 1:
-                row_table = re.search('\|\|\n((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)((?:(?!\|\||<\/td>).)+)', table)
+                row_table = re.search('\|\|\n((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)\n*((?:(?!\|\||<\/td>).)+\n*)', table)
                 if row_table:
                     row_table = row_table.groups()
                     
                     return_table = table_parser(row_table[1], row_table[2], row_table[0], number)
                     
-                    table = re.sub('\|\|\n((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)', '</td></tr><tr ' + return_table[1] + '><td ' + return_table[2] + ' ' + return_table[3] + ' ' + return_table[4] + '>', table, 1)
-
+                    table = re.sub('\|\|\n((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)\n*', '</td></tr><tr ' + return_table[1] + '><td ' + return_table[2] + ' ' + return_table[3] + ' ' + return_table[4] + '>', table, 1)
                 else:
                     break
 
             while 1:
-                cel_table = re.search('((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)((?:(?:(?!\|\||<\/td>).)|\n)+)', table)
+                cel_table = re.search('((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)\n*((?:(?:(?!\|\||<\/td>).)|\n)+\n*)', table)
                 if cel_table:
                     cel_table = cel_table.groups()
                     
                     return_table = table_parser(cel_table[1], re.sub('\n', ' ', cel_table[2]), cel_table[0], number)
                     
-                    table = re.sub('((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)', '</td><td ' + return_table[2] + ' ' + return_table[3] + ' ' + return_table[4] + '>', table, 1)
-
+                    table = re.sub('((?:\|\|)+)((?:&lt;(?:(?:(?!&gt;).)+)&gt;)*)\n*', '</td><td ' + return_table[2] + ' ' + return_table[3] + ' ' + return_table[4] + '>', table, 1)
                 else:
                     break
 
@@ -679,17 +647,13 @@ def start(conn, data, title):
 
                 if under_link[0]:
                     data = re.sub('\[\[\.\.\/(?:\|((?:(?!]]).)+))?]]', '[[' + title_data + '|' + under_link[0] + ']]', data, 1)
-
                 else:
                     data = re.sub('\[\[\.\.\/(?:\|((?:(?!]]).)+))?]]', '[[' + title_data + ']]', data, 1)
-
             else:
                 if under_link[0]:
                     data = re.sub('\[\[\.\.\/(?:\|((?:(?!]]).)+))?]]', '[[' + title + '|' + under_link[0] + ']]', data, 1)
-
                 else:
                     data = re.sub('\[\[\.\.\/(?:\|((?:(?!]]).)+))?]]', '[[' + title + ']]', data, 1)
-
         else:
             break
 
@@ -706,7 +670,6 @@ def start(conn, data, title):
                 
                 main_link = link_split[0]
                 see_link = link_split[1]
-
             else:
                 main_link = link
                 see_link = link
@@ -719,7 +682,6 @@ def start(conn, data, title):
                     file_width = width.groups()[0]
                     if re.search('px$', file_width):
                         file_style += 'width: ' + file_width + ';'
-                    
                     else:
                         file_style += 'width: ' + file_width + 'px;'
                 
@@ -728,7 +690,6 @@ def start(conn, data, title):
                     file_height = height.groups()[0]
                     if re.search('px$', file_height):
                         file_style += 'height: ' + file_height + ';'
-                    
                     else:
                         file_style += 'height: ' + file_height + 'px;'
 
@@ -737,10 +698,8 @@ def start(conn, data, title):
                     file_align = align.groups()[0]
                     if file_align == 'center':
                         file_align = 'display: block; text-align: center;'
-
                     else:
                         file_align = 'float: ' + file_align + ';'
-
                 else:
                     file_align = ''
 
@@ -748,7 +707,7 @@ def start(conn, data, title):
                     file_src = re.sub('^외부:', '', main_link)
             
                     file_alt = main_link
-
+                    exist = 'Yes'
                 else:
                     file_data = re.search('^파일:((?:(?!\.).)+)\.(.+)$', main_link)
                     if file_data:
@@ -757,16 +716,20 @@ def start(conn, data, title):
                         file_end = file_data[1]
 
                         backlink += [[title, main_link, 'file']]
-
                     else:
                         file_name = 'TEST'
                         file_end = 'jpg'
 
                     file_src = '/image/' + tool.sha224(file_name) + '.' + file_end
                     file_alt = '파일:' + file_name + '.' + file_end
-                
-                data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<span style="' + file_align + '"><img style="' + file_style + '" alt="' + file_alt + '" src="' + file_src + '"></span>', data, 1)
 
+                    curs.execute("select title from data where title = ?", [file_alt])
+                    exist = curs.fetchall()
+                
+                if exist:
+                    data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<span style="' + file_align + '"><img style="' + file_style + '" alt="' + file_alt + '" src="' + file_src + '"></span>', data, 1)
+                else:
+                    data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a id="not_thing" href="/w/' + tool.url_pas(file_alt) + '">' + file_alt + '</a>', data, 1)
             elif re.search('^분류:', main_link):
                 see_link = re.sub('#include', '', see_link)
                 main_link = re.sub('#include', '', main_link)
@@ -776,7 +739,6 @@ def start(conn, data, title):
                     link_id = 'id="inside"'
                     
                     main_link = re.sub('#blur', '', main_link)
-
                 else:
                     link_id = ''
 
@@ -784,10 +746,8 @@ def start(conn, data, title):
 
                 category += '<a ' + link_id + ' href="' + tool.url_pas(main_link) + '">' + re.sub('^분류:', '', see_link) + '</a> / '
                 data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '', data, 1)
-
             elif re.search('^wiki:', main_link):
                 data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a id="inside" href="/' + tool.url_pas(re.sub('^wiki:', '', main_link)) + '">' + see_link + '</a>', data, 1)
-
             elif re.search('^inter:((?:(?!:).)+):', main_link):
                 inter_data = re.search('^inter:((?:(?!:).)+):((?:(?!\]\]|\|).)+)', main_link)
                 inter_data = inter_data.groups()
@@ -797,26 +757,20 @@ def start(conn, data, title):
                 if inter:
                     if see_link != main_link:
                         data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a id="inside" href="' + inter[0][0] + inter_data[1] + '">' + inter_data[0] + ':' + see_link + '</a>', data, 1)
-                    
                     else:
                         data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a id="inside" href="' + inter[0][0] + inter_data[1] + '">' + inter_data[0] + ':' + inter_data[1] + '</a>', data, 1)
-
                 else:
                     data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '인터위키 정보 없음', data, 1)
-
             elif re.search('^\/', main_link):
                 under_title = re.search('^(\/(?:.+))$', main_link)
                 under_title = under_title.groups()[0]
 
                 if see_link != main_link:
                     data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '[[' + title + under_title + '|' + see_link + ']]', data, 1)
-
                 else:
                     data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '[[' + title + under_title + ']]', data, 1)
-
             elif re.search('^http(s)?:\/\/', main_link):
                 data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a id="out_link" rel="nofollow" href="' + main_link + '">' + see_link + '</a>', data, 1)
-
             else:
                 if re.search('^:', main_link):
                     main_link = re.sub('^:', '', main_link)
@@ -826,7 +780,6 @@ def start(conn, data, title):
                     link_id = 'id="not_thing"'
 
                     backlink += [[title, main_link, 'no']]
-
                 else:
                     link_id = ''
 
@@ -837,11 +790,13 @@ def start(conn, data, title):
                     other_link = other_link.groups()[0]
 
                     main_link = re.sub('(#.+)$', '', main_link)
-
                 else:
                     other_link = ''
 
-                data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a ' + link_id + ' href="/w/' + tool.url_pas(main_link) + other_link + '">' + see_link + '</a>', data, 1)
+                if main_link != title:
+                    data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a ' + link_id + ' href="/w/' + tool.url_pas(main_link) + other_link + '">' + see_link + '</a>', data, 1)
+                else:
+                    data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<b>' + see_link + '</b>', data, 1)
         else:
             break
 
@@ -859,13 +814,11 @@ def start(conn, data, title):
                 data = re.sub('(?:\[\*((?:(?! ).)*) ((?:(?!\]).)+)\]|(\[각주\]))', footnote_all, data, 1)
                 
                 footnote_all = '\n<hr><ul id="footnote_data">'
-
             else:
                 footnote = footnote_data[1]
                 footnote_name = footnote_data[0]
                 if footnote_name and not footnote:
                     data = re.sub('(?:\[\*((?:(?! |\]).)*)(?: ((?:(?!\]).)+))?\]|(\[각주\]))', '<sup><a href="#fn-' + footnote_dict[footnote_name] + '" id="rfn-' + footnote_dict[footnote_name] + '">(' + footnote_name + ')</a></sup>', data, 1)
-
                 else:
                     footnote_number += 1
 
@@ -877,7 +830,6 @@ def start(conn, data, title):
                     footnote_all += '<li><a href="#rfn-' + str(footnote_number) + '" id="fn-' + str(footnote_number) + '">(' + footnote_name + ')</a> ' + footnote + '</li>'
                     
                     data = re.sub('(?:\[\*((?:(?! |\]).)*)(?: ((?:(?!\]).)+))?\]|(\[각주\]))', '<sup><a href="#fn-' + str(footnote_number) + '" id="rfn-' + str(footnote_number) + '">(' + footnote_name + ')</a></sup>', data, 1)
-                    
         else:
             break
 
@@ -901,11 +853,14 @@ def start(conn, data, title):
     
     # 마지막 처리
     data = re.sub('(?P<in><\/h[0-9]>)(\n)+', '\g<in>', data)
+    data = re.sub('\n\n<ul>', '\n<ul>', data)
     data = re.sub('<\/ul>\n\n', '</ul>\n', data)
     data = re.sub('^(\n)+', '', data)
     data = re.sub('(\n)+<hr><ul id="footnote_data">', '<hr><ul id="footnote_data">', data)
     data = re.sub('(?P<in><td(((?!>).)*)>)\n', '\g<in>', data)
     data = re.sub('(\n)?<hr>(\n)?', '<hr>', data)
+    data = re.sub('<\/ul>\n\n<ul>', '</ul>\n<ul>', data)
+    data = re.sub("\[br\]", '\n', data)
     data = re.sub('\n', '<br>', data)
 
     return [data, plus_data, backlink]

version.md

@@ -169,7 +169,7 @@
 
 ----
 ## 기타
- * 현재 버전 : v3.0.1
+ * 현재 버전 : v3.0.2
 
 ----
 ## 개발 이념

views/acme/css/style-responsive.css

@@ -295,6 +295,7 @@ select {
 button#save {
     background: lightseagreen;
     border-color: lightseagreen;
+    margin-right: 5px;
 }
 
 button#come {

views/acme/index.html

@@ -83,7 +83,7 @@
                                 {% if imp[2][4] != '' %}
                                     <img src="https://www.gravatar.com/avatar/{{imp[2][4]|md5_replace}}?s=30">
                                 {% else %}
-                                    사용자
+                                    {{imp[2][5]}}
                                 {% endif %}
                             </a>
                         </li>