Merge pull request #1819 from openNAMU/dev

버그 수정

route/tool/func_render_namumark.py

@@ -633,7 +633,7 @@ class class_do_render_namumark:
                 return '<macro>' + match[0] + '(' + match[1] + ')' + '</macro>'
 
         # double macro replace
-        self.render_data = re.sub(r'\[([^[(]+)\(([^()]+)\)\]', do_render_macro_double, self.render_data)
+        self.render_data = re.sub(r'\[([^[(\]]+)\(((?:(?!\)\]).)+)\)\]', do_render_macro_double, self.render_data)
 
         # single macro function
         def do_render_macro_single(match):
@@ -976,8 +976,11 @@ class class_do_render_namumark:
                     link_main = self.get_tool_data_restore(link_main, do_type = 'slash')
                     link_title = link_main
                     link_main = html.unescape(link_main)
+
                     link_main = re.sub(r'"', '&quot;', link_main)
-                    
+                    link_main = re.sub(r'<', '&lt;', link_main)
+                    link_main = re.sub(r'>', '&gt;', link_main)
+
                     # sub not exist -> sub = main
                     if link_data[1]:
                         link_sub = link_data[1]

version.json

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

views/main_css/css/sub/dark.css

@@ -45,7 +45,7 @@ input::placeholder, textarea::placeholder, select::placeholder {
 }
 
 pre#syntax, pre#syntax code {
-    background: #1f2023;
+    background: #313236;
 }
 
 .hljs, .hljs-subst {
@@ -53,15 +53,15 @@ pre#syntax, pre#syntax code {
 }
 
 blockquote {
-    background-color: black;
-    border-left: 5px solid #eee;
+    background-color: #313236;
+    border-left: 4px solid #eee;
 }
 
 .opennamu_spead_footnote {
-    background-color: black;
+    background-color: #313236;
     color: white;
 }
 
 .opennamu_popup_footnote {
-    background-color: black;
+    background-color: #313236;
 }