Math 스크롤 수정

https://github.com/openNAMU/openNAMU/issues/1900

lang/en-US.json

@@ -299,6 +299,7 @@
                 "table_scroll" : "Use scroll in tables",
                 "list_view_change" : "Change how the number list is viewed",
                 "view_joke" : "Show contents of joke macro",
+                "math_scroll" : "Use scroll in math macros",
             "_comment_" : "Option",
                 "change_to_normal" : "Change to plain text.",
                 "change_to_link" : "Change to Link.",

lang/ko-KR.json

@@ -571,5 +571,6 @@
     "data": "데이터",
     "volume": "용량",
     "list_view_change" : "숫자 리스트의 보기 방식 변경",
-    "view_joke" : "농담 매크로 내용 보이기"
+    "view_joke" : "농담 매크로 내용 보이기",
+    "math_scroll" : "Math 매크로에서 스크롤 사용"
 }

route/main_setting_skin_set.py

@@ -117,6 +117,10 @@ def main_setting_skin_set():
                         <select name="main_css_view_joke">
                             ''' + set_data["main_css_view_joke"] + '''
                         </select>
+                        <h3>''' + load_lang("math_scroll") + '''</h3>
+                        <select name="main_css_math_scroll">
+                            ''' + set_data["main_css_math_scroll"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

route/tool/func.py

@@ -1128,7 +1128,7 @@ def wiki_css(data):
     data += ['' for _ in range(0, 3 - len(data))]
     
     data_css = ''
-    data_css_ver = '181'
+    data_css_ver = '182'
     
     # Func JS + Defer
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'
@@ -1460,6 +1460,10 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
                 if joke_set_data == 'off':
                     get_class_render[0] = '<style>.opennamu_joke { display: none; }</style>' + get_class_render[0]
 
+                math_set_data = get_main_skin_set(curs, flask.session, 'main_css_math_scroll', ip)
+                if math_set_data == 'on':
+                    get_class_render[0] = '<style>.katex .base { overflow-x: scroll; }</style>' + get_class_render[0]
+
                 if data_type == 'api_view' or data_type == 'api_thread':
                     return [
                         get_class_render[0], 

route/tool/func_render_namumark.py

@@ -756,8 +756,8 @@ class class_do_render_namumark:
             data = match.group(1)
 
             if self.data_math_count == 0:
-                self.render_data_cdn += '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.4/dist/katex.min.css" integrity="sha384-vKruj+a13U8yHIkAyGgK1J3ArTLzrFGBbBc0tDp4ad/EyewESeXE/Iv67Aj8gKZ0" crossorigin="anonymous">'
-                self.render_data_cdn += '<script src="https://cdn.jsdelivr.net/npm/katex@0.16.4/dist/katex.min.js" integrity="sha384-PwRUT/YqbnEjkZO0zZxNqcxACrXe+j766U2amXcgMg5457rve2Y7I6ZJSm2A0mS4" crossorigin="anonymous"></script>'
+                self.render_data_cdn += '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.8/dist/katex.min.css" integrity="sha384-GvrOXuhMATgEsSwCs4smul74iXGOixntILdUW9XmUC6+HX0sLNAK3q71HotJqlAn" crossorigin="anonymous">'
+                self.render_data_cdn += '<script src="https://cdn.jsdelivr.net/npm/katex@0.16.8/dist/katex.min.js" integrity="sha384-cpW21h6RZv/phavutF+AuVYrr+dA8xD9zs6FwLpaCct6O9ctzYFfFr4dgmgccOTx" crossorigin="anonymous"></script>'
 
             data = re.sub(r'\n', '', data)
             data = self.get_tool_data_revert(data)

route/user_setting_skin_set_main.py

@@ -77,6 +77,10 @@ def user_setting_skin_set_main_set_list():
             ['off', load_lang('off')],
             ['on', load_lang('use')]
         ], 'main_css_view_joke' : [
+            ['default', load_lang('default')],
+            ['on', load_lang('use')],
+            ['off', load_lang('off')]
+        ], 'main_css_math_scroll' : [
             ['default', load_lang('default')],
             ['off', load_lang('off')],
             ['on', load_lang('use')]
@@ -235,6 +239,11 @@ def user_setting_skin_set_main():
                         <select name="main_css_view_joke">
                             ''' + set_data["main_css_view_joke"] + '''
                         </select>
+                        <h3>''' + load_lang("math_scroll") + '''</h3>
+                        ''' + set_data_main["main_css_math_scroll"] + '''
+                        <select name="main_css_math_scroll">
+                            ''' + set_data["main_css_math_scroll"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev9",
+        "r_ver" : "v3.4.6-RC5-dev10",
         "c_ver" : "3500372",
         "s_ver" : "3500111"
     }

views/main_css/css/main.css

@@ -26,6 +26,8 @@ input[type="checkbox"], input[type="radio"] {
 
 /* 테이블 */
 table {
+    overflow-x: scroll;
+
     border-collapse: collapse;
 }
 
@@ -332,12 +334,9 @@ s:hover, strike:hover, del:hover {
     white-space: pre-line;
 }
 
-.katex {
+.katex .base {
     max-width: 100%;
-
-    display: inline-block;
-
-    overflow-x: scroll;
+    overflow-x: hidden;
     overflow-y: hidden;
 }