bgcolor 다시 지원, 각주 조금 개선

app.py

@@ -8,7 +8,7 @@ for i_data in os.listdir("route"):
 
         exec("from route." + f_src + " import *")
 
-r_ver = 'v3.0.9-stable-06'
+r_ver = 'v3.1.0-master-01'
 c_ver = '400000'
 
 print('Version : ' + r_ver)

route/tool/func.py

@@ -332,7 +332,7 @@ def ip_or_user(data):
 
 def edit_help_button():
     # https://stackoverflow.com/questions/11076975/insert-text-into-textarea-at-cursor-position-javascript
-    js_data =   '''
+    js_data = '''
         <script>
             function insert_data(name, data) {
                 if(document.selection) { 

route/tool/set_mark/namu.py

@@ -73,7 +73,7 @@ def table_parser(data, cel_data, start_data, num = 0):
     if table_bgcolor:
         all_table += 'background: ' + table_bgcolor.groups()[0] + ';'
         
-    bgcolor = re.search("<bgcolor=(#(?:[0-9a-f-A-F]{3}){1,2}|\w+)>", data)
+    bgcolor = re.search("<(?:bgcolor=)?(#(?:[0-9a-f-A-F]{3}){1,2}|\w+)>", data)
     if bgcolor:
         cel_style += 'background: ' + bgcolor.groups()[0] + ';'
         
@@ -460,10 +460,10 @@ def namu(conn, data, title, main_num):
         math = math_re.search(data)
         if math:
             if first == 0:
-                plus_data +=    '''
-                                <link rel="stylesheet" href="/views/main_css/katex/katex.min.css">
-                                <script src="/views/main_css/katex/katex.min.js"></script>
-                                '''
+                plus_data += '''
+                    <link rel="stylesheet" href="/views/main_css/katex/katex.min.css">
+                    <script src="/views/main_css/katex/katex.min.js"></script>
+                '''
 
             math = math.groups()[0]
             
@@ -726,7 +726,7 @@ def namu(conn, data, title, main_num):
 
     data = table_start(data)
 
-    category = '\n<hr><div id="cate">category : '
+    category = '\n<hr><div id="cate">Category : '
     category_re = re.compile('^(?:category|분류):', re.I)
     while 1:
         link = re.search('\[\[((?:(?!\[\[|\]\]).)+)\]\]', data)
@@ -903,7 +903,7 @@ def namu(conn, data, title, main_num):
                     else:
                         footdata_in = footdata[2]
 
-                    footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '" id="fn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> ' + footdata_in + '</li>'
+                    footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> <span id="fn-' + str(footdata[0]) + '">' + footdata_in + '</span></li>'
                 
                 data = re_footnote.sub(footdata_all + '</ul>', data, 1)
                 
@@ -921,7 +921,7 @@ def namu(conn, data, title, main_num):
 
                         footnote_all += [[float(footshort), footshort, 0]]
 
-                        data = re_footnote.sub('<sup><a href="#fn-' + footshort + '" id="rfn-' + footshort + '">(' + footshort + ')</a></sup>', data, 1)
+                        data = re_footnote.sub('<sup><a href="javascript:open_foot(\'fn-' + footshort + '\')" id="rfn-' + footshort + '">(' + footshort + ')</a></sup><span class="foot_plus" id="cfn-' + footshort + '"></span>', data, 1)
                     else:
                         data = re_footnote.sub('<sup><a href="#">(' + footnote_name + ')</a></sup>', data, 1)
                 else:
@@ -939,7 +939,7 @@ def namu(conn, data, title, main_num):
 
                     footnote_all += [[footnote_number, footnote_name, footnote]]
                     
-                    data = re_footnote.sub('<sup><a href="#fn-' + str(footnote_number) + '" id="rfn-' + str(footnote_number) + '">(' + footnote_name + ')</a></sup>', data, 1)
+                    data = re_footnote.sub('<sup><a href="javascript:open_foot(\'fn-' + str(footnote_number) + '\')" id="rfn-' + str(footnote_number) + '">(' + footnote_name + ')</a></sup><span class="foot_plus" id="cfn-' + str(footnote_number) + '"></span>', data, 1)
         else:
             break
 
@@ -953,7 +953,7 @@ def namu(conn, data, title, main_num):
         else:
             footdata_in = footdata[2]
 
-        footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '" id="fn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> ' + footdata_in + '</li>'
+        footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> <span id="fn-' + str(footdata[0]) + '">' + footdata_in + '</span></li>'
 
     footdata_all += '</ul>'
     if footdata_all == '\n<hr><ul id="footnote_data"></ul>':
@@ -964,7 +964,7 @@ def namu(conn, data, title, main_num):
     category += '</div>'
     category = re.sub(' / <\/div>$', '</div>', category)
 
-    if category == '\n<hr><div id="cate">category : </div>':
+    if category == '\n<hr><div id="cate">Category : </div>':
         category = ''
 
     data += category

views/main_css/main.css

@@ -32,4 +32,6 @@ s:hover, strike:hover, del:hover { color: gray; background-color: gainsboro; tex
 #main_table_width_quarter { width: 25%; }
 #redirect { border: 1px solid; padding: 10px; }
 body { word-break: break-all; overflow: scroll; }
-hr.main_hr { border: none; }
+hr.main_hr { border: none; }
+#include_link { display: none; }
+.foot_plus { background: gainsboro; }

views/main_css/main.js

@@ -0,0 +1,10 @@
+function open_foot(name) {
+    var g_data = document.getElementById(name);
+    var o_data = document.getElementById('c' + name);
+
+    if(o_data.innerHTML === '') {
+        o_data.innerHTML += '<sup><a onclick="open_foot(\'' + name + '\')" href="#' + name + '">(Go)</a></sup> ' + g_data.innerHTML;
+    } else {
+        o_data.innerHTML = '';
+    }
+}

views/neo_yousoro/index.html

@@ -4,6 +4,7 @@
         <meta charset="utf-8">
         <title>{{imp[0]}} - {{imp[1][0]}}</title>
         <link rel="stylesheet" href="/views/main_css/main.css">
+        <script src="/views/main_css/main.js"></script>
         <link rel="stylesheet" href="/views/neo_yousoro/css/main.css">
         <script src="/views/neo_yousoro/js/main.js"></script>
         <script src="/views/neo_yousoro/js/skin_set.js"></script>