Bladeren bron

문법 수정

ect (or 2du) 8 jaren geleden
bovenliggende
commit
4fb0f42096
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 2 2
      mark.py

+ 2 - 2
mark.py

@@ -477,6 +477,7 @@ def cat_plus(name, link, num):
 def namumark(title, data, num, in_c):    
 def namumark(title, data, num, in_c):    
     data = re.sub("\n", "\r\n", re.sub("\r\n", "\n", data))
     data = re.sub("\n", "\r\n", re.sub("\r\n", "\n", data))
     data = html_pas(data)
     data = html_pas(data)
+    data = '\r\n' + data + '\r\n'
 
 
     fol_num = 0
     fol_num = 0
     var_d = mid_pas(data, fol_num, 0, in_c)
     var_d = mid_pas(data, fol_num, 0, in_c)
@@ -525,7 +526,7 @@ def namumark(title, data, num, in_c):
         else:
         else:
             break
             break
 
 
-    data = re.sub("##\s?(?P<in>[^\n]*)\n", "", data)
+    data = re.sub("##\s?([^\n]*)\r\n", "", data)
     
     
     data = re.sub("\[anchor\((?P<in>[^\[\]]*)\)\]", '<span id="\g<in>"></span>', data)
     data = re.sub("\[anchor\((?P<in>[^\[\]]*)\)\]", '<span id="\g<in>"></span>', data)
     data = savemark(data)
     data = savemark(data)
@@ -551,7 +552,6 @@ def namumark(title, data, num, in_c):
         else:
         else:
             break
             break
             
             
-    data = '\r\n' + data + '\r\n'
     data = re.sub("\[nicovideo\((?P<in>[^,)]*)(?:(?:,(?:[^,)]*))+)?\)\]", "[[http://embed.nicovideo.jp/watch/\g<in>]]", data)
     data = re.sub("\[nicovideo\((?P<in>[^,)]*)(?:(?:,(?:[^,)]*))+)?\)\]", "[[http://embed.nicovideo.jp/watch/\g<in>]]", data)
     
     
     while(1):
     while(1):