Sfoglia il codice sorgente

포함 혼종 버그 수정

ect (or 2du) 8 anni fa
parent
commit
bd668ad6a5
2 ha cambiato i file con 5 aggiunte e 2 eliminazioni
  1. 1 1
      set_mark/end.py
  2. 4 1
      set_mark/include_pas.py

+ 1 - 1
set_mark/end.py

@@ -13,7 +13,7 @@ def end(data, category):
     data = re.sub('<\/blockquote>(?:(?:\r)?\n)<br><blockquote>', '</blockquote><blockquote>', data)
 
     data = re.sub('\n', '<br>', data)
-    data = re.sub('<hr style="margin-top: -5px;"><br>', '<hr style="margin-top: -5px;">', data)
+    data = re.sub('<hr id="under_bar"([^>]*)><br>', '<hr style="margin-top: -5px;">', data)
     data = re.sub('&lt;isbr&gt;', '\r\n', data)
     data = re.sub('^(?:<br>|\r|\n| )+', '', data)
     data = re.sub('^<div style="margin-top: 30px;" id="cate">', '<div id="cate">', data)        

+ 4 - 1
set_mark/include_pas.py

@@ -54,7 +54,10 @@ def include_pas(conn, data, title, in_c, num, toc_y, fol_num):
                 if(results[2]):
                     test = '<br>'
                 else:
-                    test = ''
+                    if(re.search('\|\|', in_data)):
+                        test = '\n'
+                    else:
+                        test = ''
 
                 data = include.sub('<nobr><a id="include_link" href="/w/' + url_pas(results[0]) + '">[' + results[0] + ' 이동]</a><br><span>' + in_data + '</span>' + test, data, 1)
             else: