Merge pull request #1855 from openNAMU/dev

Dev

route/main_setting_skin_set.py

@@ -100,6 +100,10 @@ def main_setting_skin_set():
                         <select name="main_css_darkmode">
                             ''' + set_data["main_css_darkmode"] + '''
                         </select>
+                        <h3>''' + load_lang("table_scroll") + '''</h3>
+                        <select name="main_css_table_scroll">
+                            ''' + set_data["main_css_table_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

@@ -1404,6 +1404,10 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
                         </style>
                     '''
 
+                table_set_data = get_main_skin_set(curs, flask.session, 'main_css_table_scroll', ip_check())
+                if table_set_data == 'on':
+                    get_class_render[0] += '<style>.table_safe { overflow-x: scroll; white-space: nowrap; }</style>'
+
                 if data_type == 'api_view' or data_type == 'api_thread':
                     return [
                         get_class_render[0], 

route/tool/func_render_namumark.py

@@ -741,6 +741,7 @@ class class_do_render_namumark:
                     file_bgcolor = ''
                     file_turn = ''
                     file_radius = ''
+                    file_rendering = ''
 
                     file_split_regex = r'(?:^|&) *((?:(?!&).)+)'
                     file_split_sub_regex = r'(^[^=]+) *= *([^=]+)'
@@ -766,6 +767,9 @@ class class_do_render_namumark:
                                         file_turn = 'light'
                                 elif data_sub[0] == 'border-radius':
                                     file_radius = self.get_tool_px_add_check(data_sub[1])
+                                elif data_sub[0] == 'rendering':
+                                    if data_sub[1] == 'pixelated':
+                                        file_rendering = 'pixelated'
 
                     link_main_org = ''
                     link_sub = link_main
@@ -826,11 +830,16 @@ class class_do_render_namumark:
                     if file_radius != '':
                         file_radius = 'border-radius:' + self.get_tool_css_safe(file_radius) + ';'
 
+                    if file_rendering != '':
+                        file_rendering = 'image-rendering:' + self.get_tool_css_safe(file_rendering) + ';'
+
+                    file_style = file_width + file_height + file_align_style + file_bgcolor + file_radius + file_rendering
+
                     image_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_image_set', self.ip)
                     if image_set == 'new_click' or image_set == 'click':
-                        file_end = '<img style="' + file_width + file_height + file_align_style + file_bgcolor + file_radius + '" id="opennamu_image_' + str(image_count) + '" alt="' + link_sub + '" src="">'
+                        file_end = '<img style="' + file_style + '" id="opennamu_image_' + str(image_count) + '" alt="' + link_sub + '" src="">'
                     else:
-                        file_end = '<img style="' + file_width + file_height + file_align_style + file_bgcolor + file_radius + '" alt="' + link_sub + '" src="' + link_main + '">'
+                        file_end = '<img style="' + file_style + '" alt="' + link_sub + '" src="' + link_main + '">'
 
                     if file_align == 'center':
                         file_end = '<div style="text-align:center;">' + file_end + '</div>'
@@ -1540,7 +1549,7 @@ class class_do_render_namumark:
                 table_data_end = '<table class="' + table_parameter['class'] + '" style="' + table_parameter['table'] + '">' + table_caption + table_data_end + '</table>'
                 table_data_end = '<div class="table_safe" style="' + table_parameter['div'] + '">' + table_data_end + '</div>'
 
-                self.render_data = re.sub(table_regex, lambda x : ('\n<front_br>' + table_data_end + '<back_br>\n'), self.render_data, 1)
+                self.render_data = re.sub(table_regex, lambda x : ('\n<front_br>' + table_data_end + '\n'), self.render_data, 1)
 
             table_count_all -= 1
     

route/user_setting_skin_set_main.py

@@ -64,6 +64,10 @@ def user_setting_skin_set_main_set_list():
             ['default', load_lang('default')],
             ['off', load_lang('off')],
             ['on', load_lang('use')]
+        ], 'main_css_table_scroll' : [
+            ['default', load_lang('default')],
+            ['off', load_lang('off')],
+            ['on', load_lang('use')]
         ]
     }
 
@@ -198,6 +202,11 @@ def user_setting_skin_set_main():
                         <select name="main_css_darkmode">
                             ''' + set_data["main_css_darkmode"] + '''
                         </select>
+                        <h3>''' + load_lang("table_scroll") + '''</h3>
+                        ''' + set_data_main["main_css_table_scroll"] + '''
+                        <select name="main_css_table_scroll">
+                            ''' + set_data["main_css_table_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/view_diff.py

@@ -76,11 +76,11 @@ def view_diff(name = 'Test', num_a = 1, num_b = 1):
                             result += '</td></tr><tr><td style="width: 40px; user-select: none;">' + str(line) + '</td><td>'
 
                     if for_a[1] == 1:
-                        result += '<span style="background: #eaf2c2;">' + for_a[2] + '</span>'
+                        result += '<span style="background: #eaf2c2;">' + html.escape(for_a[2]) + '</span>'
                     elif for_a[1] == 0:
-                        result += for_a[2]
+                        result += html.escape(for_a[2])
                     else:
-                        result += '<span style="background: #fadad7;">' + for_a[2] + '</span>'
+                        result += '<span style="background: #fadad7;">' + html.escape(for_a[2]) + '</span>'
 
                 result += '</td></tr></table>'
 

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev210",
+        "r_ver" : "v3.4.6-RC3-dev213",
         "c_ver" : "3500361",
         "s_ver" : "3500111"
     }