파서 버그 수정

route/tool/set_mark/namumark.py

@@ -442,9 +442,22 @@ def namumark(conn, data, title, main_num, include_num):
     
     data = re.sub('<math>(?P<in>(?:(?!<\/math>).)+)<\/math>', '[math(\g<in>)]', data)
     data = html.escape(data)
-
     data = re.sub('\r\n', '\n', data)
 
+    num = 0
+    while 1:
+        one_nowiki = re.search('(?:\\\\)(.)', data)
+        if one_nowiki:
+            one_nowiki = one_nowiki.groups()
+
+            num += 1
+
+            end_data += [['one_nowiki_' + str(num), one_nowiki[0], 'normal']]
+
+            data = re.sub('(?:\\\\)(.)', '<span id="one_nowiki_' + str(num) + '"></span>', data, 1)
+        else:
+            break
+
     t_data = middle_parser(data, 0, 0, 0, include_num)
     data = t_data[0]
 
@@ -536,23 +549,8 @@ def namumark(conn, data, title, main_num, include_num):
             '''
         else:
             break
-            
-    num = 0
-    while 1:
-        one_nowiki = re.search('(?:\\\\)(.)', data)
-        if one_nowiki:
-            one_nowiki = one_nowiki.groups()
-
-            num += 1
-
-            end_data += [['one_nowiki_' + str(num), one_nowiki[0], 'normal']]
-
-            data = re.sub('(?:\\\\)(.)', '<span id="one_nowiki_' + str(num) + '"></span>', data, 1)
-        else:
-            break
 
     data += '\n'
-
     data = data.replace('\\', '&#92;')
 
     data = re.sub('&#x27;&#x27;&#x27;(?P<in>((?!&#x27;&#x27;&#x27;).)+)&#x27;&#x27;&#x27;', '<b>\g<in></b>', data)
@@ -680,23 +678,23 @@ def namumark(conn, data, title, main_num, include_num):
 
     data = tool.savemark(data)
     
-    data = re.sub(r"\[anchor\((?P<in>(?:(?!\)\]).)+)\)\]", '<span id="\g<in>"></span>', data, flags = re.I)
+    data = re.sub("\[anchor\((?P<in>(?:(?!\)\]).)+)\)\]", '<span id="\g<in>"></span>', data, flags = re.I)
 
-    ruby_all = re.findall(r"\[ruby\(((?:(?:(?!\)\]).)+))\)\]", data, flags = re.I)
+    ruby_all = re.findall("\[ruby\(((?:(?:(?!\)\]).)+))\)\]", data, flags = re.I)
     for i in ruby_all:
-        ruby_code = re.search(r'^([^,]+)', i)
+        ruby_code = re.search('^([^,]+)', i)
         if ruby_code:
             ruby_code = ruby_code.groups()[0]
         else:
             ruby_code = 'Test'
 
-        ruby_top = re.search(r'ruby=([^,]+)', i, flags = re.I)
+        ruby_top = re.search('ruby=([^,]+)', i, flags = re.I)
         if ruby_top:
             ruby_top = ruby_top.groups()[0]
         else:
             ruby_top = 'Test'
 
-        ruby_color = re.search(r'color=([^,]+)', i, flags = re.I)
+        ruby_color = re.search('color=([^,]+)', i, flags = re.I)
         if ruby_color:
             ruby_color = 'color: ' + ruby_color.groups()[0] + ';'
         else:
@@ -711,15 +709,15 @@ def namumark(conn, data, title, main_num, include_num):
             '</ruby>' + \
         ''
 
-        data = re.sub(r"\[ruby\(((?:(?:(?!\)\]).)+))\)\]", ruby_data, data, 1, flags = re.I)
+        data = re.sub("\[ruby\(((?:(?:(?!\)\]).)+))\)\]", ruby_data, data, 1, flags = re.I)
 
 
     curs.execute(tool.db_change('select data from other where name = "count_all_title"'))
     all_title = curs.fetchall()
-    data = re.sub(r'\[pagecount\]', all_title[0][0], data, flags = re.I)
+    data = re.sub('\[pagecount\]', all_title[0][0], data, flags = re.I)
 
     now_time = tool.get_time()
-    data = re.sub(r'\[date\]', now_time, data, flags = re.I)
+    data = re.sub('\[date\]', now_time, data, flags = re.I)
     
     time_data = re.search('^([0-9]{4}-[0-9]{2}-[0-9]{2})', now_time)
     time = time_data.groups()
@@ -1040,12 +1038,12 @@ def namumark(conn, data, title, main_num, include_num):
                         
                             backlink += [[title, main_link, '']]
                             
-                            data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a ' + link_id + ' href="/w/' + tool.url_pas(main_link) + other_link + '">' + see_link + '</a>', data, 1)
+                            data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a ' + link_id + ' title="' + see_link + other_link + '" href="/w/' + tool.url_pas(main_link) + other_link + '">' + see_link + '</a>', data, 1)
                         else:
-                            data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a href="' + other_link + '">' + see_link + '</a>', data, 1)
+                            data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a title="' + see_link + '" href="' + other_link + '">' + see_link + '</a>', data, 1)
                     else:
                         if re.search('^#', other_link):
-                            data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a href="' + other_link + '">' + other_link + '</a>', data, 1)
+                            data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<a title="' + other_link + '" href="' + other_link + '">' + other_link + '</a>', data, 1)
                         else:
                             data = re.sub('\[\[((?:(?!\[\[|\]\]).)+)\]\]', '<b>' + see_link + '</b>', data, 1)
                 else:

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-25",
+        "r_ver" : "v3.1.5-master-26",
         "c_ver" : "400006",
         "s_ver" : "6"
     }, "stable" : {

views/marisa/css/dark.css

@@ -28,7 +28,7 @@ textarea, input, button, select {
     color: white;
 }
 
-#toron_color_grey, code {
+#toron_color_grey {
     background: #4a4a4a;
 }
 

views/marisa/css/main.css

@@ -28,10 +28,6 @@ button {
     border-radius: 10px;
 }
 
-code {
-    background: gainsboro;
-}
-
 td {
     border: 1px solid gainsboro;
 }

views/marisa/index.html

@@ -7,7 +7,7 @@
         <link rel="stylesheet" href="/views/marisa/css/main.css?ver=6">
         <script src="/views/marisa/js/search.js?ver=2"></script>
         <script src="/views/marisa/js/skin_set.js?ver=3"></script>
-        <script src="/views/marisa/js/main.js?ver=2"></script>
+        <script src="/views/marisa/js/main.js?ver=3"></script>
         <script>window.onload = function () { search_do(); skin_set(); }</script>
         <script src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
         <link rel="shortcut icon" href="/views/main_css/file/favicon.ico?ver=1">

views/marisa/js/skin_set.js

@@ -63,7 +63,7 @@ function main_load() {
         cookies.match(regex_data('invert')) &&
         cookies.match(regex_data('invert'))[1] === '1'
     ) {
-        head_data.innerHTML += '<link rel="stylesheet" href="/views/marisa/css/dark.css?ver=3">';
+        head_data.innerHTML += '<link rel="stylesheet" href="/views/marisa/css/dark.css?ver=4">';
     }
 }