Browse Source

나무마크 일부 수정

https://github.com/openNAMU/openNAMU/issues/2183
잉여개발기 2 years ago
parent
commit
3c048de84f
3 changed files with 7 additions and 5 deletions
  1. 2 2
      route/go_api_w_render.py
  2. 4 2
      route/tool/func_render_namumark.py
  3. 1 1
      version.json

+ 2 - 2
route/go_api_w_render.py

@@ -65,8 +65,8 @@ def api_w_render(db_set, name = '', tool = ''):
                 data_option_func = api_w_render_include(data_option)
 
                 # parameter replace
-                data_org = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9]+)=((?:\\@|[^@\n])+)@', data_option_func, data_org)
-                data_org = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9]+)@', data_option_func, data_org)
+                data_org = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9_]+)=((?:\\@|[^@\n])+)@', data_option_func, data_org)
+                data_org = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9_]+)@', data_option_func, data_org)
 
                 # remove end br
                 data_org = re.sub('^\n+', '', data_org)

+ 4 - 2
route/tool/func_render_namumark.py

@@ -857,6 +857,8 @@ class class_do_render_namumark:
         self.render_data = re.sub(math_regex, do_render_math_sub, self.render_data)
 
     def do_render_link(self):
+        self.render_data = self.render_data.replace('[[]]', '')
+
         link_regex = r'\[\[((?:(?!\[\[|\]\]|\||<|>).|<(?:\/?(?:slash)_(?:[0-9]+)(?:[^<>]+))>)+)(?:\|((?:(?!\[\[|\]\]|\|).)+))?\]\](\n?)'
         image_count = 0
         link_count_all = len(re.findall(link_regex, self.render_data)) * 4
@@ -1307,8 +1309,8 @@ class class_do_render_namumark:
 
                 return slash_add + match[2]
 
-        self.render_data = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9]+)=((?:\\@|[^@\n])+)@', do_render_include_default_sub, self.render_data)
-        self.render_data = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9]+)@', do_render_include_default_sub, self.render_data)
+        self.render_data = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9_]+)=((?:\\@|[^@\n])+)@', do_render_include_default_sub, self.render_data)
+        self.render_data = re.sub(r'(\\+)?@([ㄱ-힣a-zA-Z0-9_]+)@', do_render_include_default_sub, self.render_data)
 
     def do_render_include(self):
         include_num = 0

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev106",
+        "r_ver" : "v3.5.0-dev107",
         "c_ver" : "20240426",
         "s_ver" : "20240426"
     }