Merge pull request #1739 from openNAMU/dev

Dev

.gitignore

@@ -30,6 +30,7 @@ views/before_namu
 views/acme
 views/sl_open
 views/nitori
+views/jsonnamu
 
 sitemap.xml
 sitemap_0.xml

route/tool/func.py

@@ -1124,7 +1124,7 @@ def wiki_css(data):
 
 def cut_100(data):
     # without_DB
-    data = re.sub(r'.*<div class="opennamu_render_complete">', '', data, 1)
+    data = re.sub(r'(.|\r|\n)*<div class="opennamu_render_complete">', '', data, 1)
 
     data = data.replace('<br>', ' ')
     data = data.replace('\r', '') 

route/tool/func_render_namumark.py

@@ -669,7 +669,7 @@ class class_do_render_namumark:
 
             name_ob = 'opennamu_math_' + str(self.data_math_count)
 
-            data_name = self.get_tool_data_storage('<span id="' + name_ob + '">', '</span>', match.group(0))
+            data_name = self.get_tool_data_storage('<span id="' + name_ob + '">' + data_html, '</span>', match.group(0))
 
             self.render_data_js += '' + \
                 'try {\n' + \
@@ -1082,7 +1082,7 @@ class class_do_render_namumark:
             elif not match:
                 break
             else:
-                if self.doc_include != '':
+                if re.search('opennamu_include_', self.doc_include):
                     self.render_data = re.sub(include_regex, '', self.render_data, 1)
                 else:
                     match_org = match.group(0)
@@ -1157,9 +1157,6 @@ class class_do_render_namumark:
 
             include_count_max -= 1
 
-    def do_render_list(self):
-        pass
-
     def do_redner_footnote(self):
         footnote_num = 0
         footnote_regex = re.compile('(?:\[\*((?:(?!\[\*|\]| ).)+)?(?: ((?:(?!\[\*|\]).)+))?\]|\[(각주|footnote)\])', re.I)
@@ -1918,8 +1915,6 @@ class class_do_render_namumark:
             
         self.do_render_last()
 
-        # print(self.data_temp_storage)
-
         return [
             self.render_data, # html
             self.render_data_js, # js

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev148",
         "c_ver" : "3500360",
+        "r_ver" : "v3.4.6-RC3-dev151",
         "s_ver" : "3500111"
     }
 }