Surplus_Up (2DU) 6 лет назад
Родитель
Сommit
127345445b
2 измененных файлов с 8 добавлено и 9 удалено
  1. 7 8
      route/tool/set_mark/namumark.py
  2. 1 1
      version.json

+ 7 - 8
route/tool/set_mark/namumark.py

@@ -879,12 +879,6 @@ def namumark(conn, data, title, include_num):
     data = data.replace('<macro_middle>', '(')
     data = data.replace('<macro_end>', ')]')
 
-    if re.search(r'\[pagecount\]', data, flags = re.I):
-        plus_data += 'page_count();\n'
-        data = re.sub(r'\[pagecount\]', '<span class="all_page_count"></span>', data, flags = re.I)
-
-    data = re.sub(r'\[date\]', now_time, data, flags = re.I)
-
     while 1:
         block = re.search(r'(\n(?:&gt; ?(?:(?:(?!\n).)+)?\n)+)', data)
         if block:
@@ -1184,8 +1178,13 @@ def namumark(conn, data, title, include_num):
         else:
             break
 
-    br_re = re.compile(r'\[br\]', re.I)
-    data = br_re.sub('<br>', data)
+    if re.search(r'\[pagecount\]', data, flags = re.I):
+        plus_data += 'page_count();\n'
+        data = re.sub(r'\[pagecount\]', '<span class="all_page_count"></span>', data, flags = re.I)
+
+    data = re.sub(r'\[date\]', now_time, data, flags = re.I)
+    data = re.sub(r'\[clearfix\]', '<div style="clear:both"></div>', data, flags = re.I)
+    data = re.sub(r'\[br\]', '<br>', data, flags = re.I)
 
     footnote_number = 0
 

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.9-master-33",
+        "r_ver" : "v3.1.9-master-34",
         "c_ver" : "3193200",
         "s_ver" : "9"
     }, "stable" : {