일부 버그 수정 및 간단화

set_mark/end.py

@@ -9,19 +9,11 @@ def end(data, category):
     data = re.sub("(\n#no-br#|#no-br#\n|#no-br#)", "", data)
     data = re.sub("<space>", " ", data)
 
-    com = re.compile('#base64#((?:(?!#\/base64#|%0A).)+)#\/base64#', re.DOTALL)
-    while 1:
-        m = com.search(data)
-        if m:
-            data = com.sub('<code>' + parse.unquote(m.groups()[0]).replace('&#95;', '_') + '</code>', data, 1)
-        else:
-            break
-
     com = re.compile('#base64#((?:(?!#\/base64#).)+)#\/base64#', re.DOTALL)
     while 1:
         m = com.search(data)
         if m:
-            data = com.sub('<pre style="margin-top: 10px;">' + parse.unquote(m.groups()[0]).replace('&#95;', '_').replace('\r\n', '<br>') + '</pre>', data, 1)
+            data = com.sub(parse.unquote(m.groups()[0]).replace('&#95;', '_').replace('\r\n', '<br>'), data, 1)
         else:
             break
 
@@ -41,22 +33,14 @@ def end(data, category):
     data = re.sub('<br><ul id="list">', '<ul id="list">', data)
     data = re.sub('<\/ul>\r<br>', '</ul>', data)
     data = re.sub('<\/table>\r<br><ul ', '</table><ul ', data)
-    data = re.sub('<pre style="margin-top: 10px;"><br>', '<pre style="margin-top: 10px;">', data)
-    data = re.sub('<\/pre>\r<br>', '</pre>', data)
     data = re.sub('<hr id="under_bar"([^>]*)>(\r)?<br>', '<hr id="under_bar" style="margin-top: -5px;">', data)
     data = re.sub('&lt;isbr&gt;', '\r\n', data)
     data = re.sub('^(?:<br>|\r|\n| )+', '', data)
     data = re.sub('^<div style="margin-top: 30px;" id="cate">', '<div id="cate">', data)        
     data = re.sub('&amp;#92;', '&#92;', data)
-    
-    data = data.replace('#mid#', '{{{')
-    data = data.replace('#/mid#', '}}}')
-
-    data = data.replace('#mid2#', '{{{')
-    data = data.replace('#/mid2#', '}}}')
 
-    if re.search('&lt;math&gt;((?:(?!&lt;\/math&gt;).)*)&lt;\/math&gt;', data):
-        data += '<script type="text/x-mathjax-config">MathJax.Hub.Config({ extensions: ["tex2jax.js", "AMSmath.js"], jax: ["input/TeX", "output/HTML-CSS"], tex2jax: { inlineMath: [ [\'<math>\',\'</math>\'] ],processEscapes: true }, }); </script>'
+    if re.search('\[math\]((?:(?!\[\/math\]).)*)\[\/math\]', data):
+        data += '<script type="text/x-mathjax-config">MathJax.Hub.Config({ extensions: ["tex2jax.js", "AMSmath.js"], jax: ["input/TeX", "output/HTML-CSS"], tex2jax: { inlineMath: [ [\'[math]\',\'[/math]\'] ],processEscapes: true }, }); </script>'
         data += '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.3/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'
 
     return data

set_mark/table.py

@@ -133,7 +133,7 @@ def table(data):
     data = re.sub("#table-no-br#", "\r\n", data)
     
     while 1:
-        m = re.search("(\|\|(?:(?:(?:.*)\n?)\|\|)+)", data)
+        m = re.search("(?:\n|<br>)(\|\|(?:(?:(?:.*)\n?)\|\|)+)", data)
         if m:
             results = m.groups()
             table = results[0]
@@ -239,7 +239,7 @@ def table(data):
                 else:
                     break
             
-            data = re.sub("(\|\|(?:(?:(?:.*)\n?)\|\|)+)", table, data, 1)
+            data = re.sub("(?:\n|<br>)(\|\|(?:(?:(?:.*)\n?)\|\|)+)", table, data, 1)
         else:
             break
         

set_mark/text_help.py

@@ -8,6 +8,7 @@ def text_help(data):
     data = re.sub('\^\^(?P<in>.+?)\^\^(?!\^)', '<sup>\g<in></sup>', data)
     data = re.sub(',,(?P<in>.+?),,(?!,)', '<sub>\g<in></sub>', data) 
     data = re.sub('{{\|(?P<in>(?:(?:(?:(?!\|}}).)*)(?:\n?))+)\|}}', '<table><tbody><tr><td>\g<in></td></tr></tbody></table>', data)
+    data = re.sub('&lt;math&gt;(?P<in>(?:(?!&lt;\/math&gt;).)*)&lt;\/math&gt;', '[math]\g<in>[/math]', data)
 
     while 1:
         if re.search("\n-{4,9}( *)\r\n", data):