fix bug & design

route/tool/func.py

@@ -41,8 +41,11 @@ for i in range(0, 2):
             print(e)
             print('----')
             if platform.system() == 'Linux' or platform.system() == 'Windows':
-                ok = os.system('python' + ('3' if platform.system() != 'Windows' else '') + ' -m pip install --user -r requirements.txt')
-                if ok == 0:
+                sys_pip_ins = os.system(
+                    'python' + ('3' if platform.system() != 'Windows' else '') + ' ' + \
+                    '-m pip install --user -r requirements.txt'
+                )
+                if sys_pip_ins == 0:
                     print('----')
                     try:
                         os.execl(sys.executable, sys.executable, *sys.argv)
@@ -55,17 +58,16 @@ for i in range(0, 2):
                 else:
                     print('Error : library install failed')
                     raise
-            else:
-                print('----')
-                print(e)
-                raise
-        else:
-            print('----')
-            print(e)
-            raise
+            
+        print('----')
+        print(e)
+        raise
 
 global_lang = {}
-req_list = ''
+
+data_css_ver = '75'
+data_css = ''
+
 conn = ''
 curs = ''
 
@@ -586,18 +588,19 @@ def next_fix(link, num, page, end = 50):
     return list_data
 
 def other2(data):
-    global req_list
-    main_css_ver = '79'
+    global data_css
+    global data_css_ver
+
     data += ['' for _ in range(0, 3 - len(data))]
 
-    if req_list == '':
+    if data_css == '':
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):
             if i_data != 'sub':
-                req_list += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=' + main_css_ver + '">'
+                data_css += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=' + data_css_ver + '">'
 
         for i_data in os.listdir(os.path.join("views", "main_css", "js")):
             if i_data != 'sub':
-                req_list += '<script src="/views/main_css/js/' + i_data + '?ver=' + main_css_ver + '"></script>'
+                data_css += '<script src="/views/main_css/js/' + i_data + '?ver=' + data_css_ver + '"></script>'
 
     data = data[0:2] + ['', '''
         <link   rel="stylesheet"
@@ -610,7 +613,7 @@ def other2(data):
                 integrity="sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4"
                 crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/highlight.min.js"></script>
-    ''' + req_list + '<script>window.addEventListener(\'DOMContentLoaded\', main_css_skin_load);</script>'] + data[2:]
+    ''' + data_css + '<script>window.addEventListener(\'DOMContentLoaded\', main_css_skin_load);</script>'] + data[2:]
 
     return data
 

route/tool/mark.py

@@ -12,8 +12,8 @@ import urllib.parse
 conn = ''
 curs = ''
 
-if os.path.exists('route/tool/set_mark/custom.py'):
-    from .set_mark.custom import custom_mark
+if os.path.exists('route/tool/custom.py'):
+    from .custom import custom_mark
 else:
     def custom_mark(conn, data, title, num, include):
         return [data, '', []]
@@ -40,12 +40,9 @@ def send_parser(data):
     return data
 
 def render_do(title, data, num, include):
-    if num == 3:
-        num = 1
-        back_num = 3
-    else:
-        back_num = num
-
+    # num == 1 -> commit O | html
+    # num == 2 -> commit X | list
+    # num == 3 -> commit X 
     curs.execute(db_change('select data from other where name = "markup"'))
     rep_data = curs.fetchall()
     if rep_data[0][0] == 'namumark':
@@ -56,20 +53,27 @@ def render_do(title, data, num, include):
         include = (include + '_') if include else ''
         data = [
             '<div id="' + include + 'render_content">' + html.escape(data) + '</div>', 
-            'do_onmark_render(0, "' + include + 'render_content");',
+            '''
+                do_onmark_render(
+                    test_mode = 0, 
+                    name_id = "''' + include + '''render_content",
+                    name_include = "'''·+ include + '''",
+                    name_doc = "''' +title.replace('"', '//"') + '''",
+                );
+            ''',
             []
         ]
     else:
         data = [data, '', []]
 
-    if num == 1:
+    if num in [1, 3]:
         if data[2] == []:
             curs.execute(db_change("insert into back (title, link, type) values ('test', ?, 'nothing')"), [title])
         else:
             curs.executemany(db_change("insert into back (link, title, type) values (?, ?, ?)"), data[2])
             curs.execute(db_change("delete from back where title = ? and type = 'no'"), [title])
 
-        if back_num != 3:
+        if num != 3:
             conn.commit()
 
     if num == 2:

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-stable-13 (beta-60) (dev-2021-03-26-01)",
+        "r_ver" : "v3.2.0-stable-13 (beta-60) (dev-2021-03-29-01)",
         "c_ver" : "3206000",
         "s_ver" : "11"
     }

views/main_css/css/main.css

@@ -24,10 +24,6 @@ input {
     margin-top: 10px;
 }
 
-#toc-name {
-    font-size: 18px;
-}
-
 table {
     border-collapse: collapse;
 }
@@ -164,7 +160,7 @@ body {
 }
 
 #toc_title {
-    font-size: 18px;
+    font-size: 1.2rem;
 }
 
 #admin_log_search {
@@ -246,7 +242,6 @@ blockquote {
     background-position: calc(100% - 10px) 10px;
     background-repeat: no-repeat;
     background-size: 25px;
-    font-size: inherit;
 }
 
 hr {

views/marisa/css/main.css

@@ -4,7 +4,7 @@ body {
     word-wrap: break-word;
     margin: 0;
     font-family: 'Apple SD Gothic', '맑은고딕', 'Nanum Gothic', 'Noto Sans KR', sans-serif;
-    font-size: 14px;
+    font-size: 0.85rem;
 }
 
 ul {

views/marisa/index.html

@@ -8,7 +8,7 @@
             <title>{{imp[0]}} - {{imp[1][0]}}</title>
         {% endif %}
         {{imp[3][3]|safe}}
-        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=16">
+        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=17">
         <script src="/views/marisa/js/skin_set.js?ver=6"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
         <script>main_load(); window.addEventListener('DOMContentLoaded', skin_set);</script>