2DU 8 лет назад
Родитель
Сommit
2de36456ef
2 измененных файлов с 8 добавлено и 21 удалено
  1. 5 2
      app.py
  2. 3 19
      mark.py

+ 5 - 2
app.py

@@ -3103,10 +3103,13 @@ def upload():
                                 <input type="file" name="f_data"> \
                                 <input type="file" name="f_data"> \
                                 <br> \
                                 <br> \
                                 <br> \
                                 <br> \
-                                <input placeholder="파일 이름" name="f_name"> \
+                                <input placeholder="파일 이름" name="f_name" type="text"> \
                                 <br> \
                                 <br> \
                                 <br> \
                                 <br> \
-                                <input placeholder="라이선스" name="f_lice"> \
+                                <input placeholder="라이선스" name="f_lice" type="text"> \
+                                <br> \
+                                <br> \
+                                <span>원인 모를 버그로 한글이 되지 않습니다.</span> \
                                 <br> \
                                 <br> \
                                 <br> \
                                 <br> \
                                 <button class="btn btn-primary" type="submit">저장</button> \
                                 <button class="btn btn-primary" type="submit">저장</button> \

+ 3 - 19
mark.py

@@ -547,25 +547,9 @@ def namumark(title, data, num, in_c, toc_y):
     data = re.sub('__(?P<in>.+?)__(?!_)', '<u>\g<in></u>', data)
     data = re.sub('__(?P<in>.+?)__(?!_)', '<u>\g<in></u>', data)
     data = re.sub('\^\^(?P<in>.+?)\^\^(?!\^)', '<sup>\g<in></sup>', 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>.+?),,(?!,)', '<sub>\g<in></sub>', data)
-    
     data = re.sub('&lt;math&gt;(?P<in>((?!&lt;math&gt;).)*)&lt;\/math&gt;', '$\g<in>$', data)
     data = re.sub('&lt;math&gt;(?P<in>((?!&lt;math&gt;).)*)&lt;\/math&gt;', '$\g<in>$', data)
-    
-    data = re.sub('{{\|(?P<in>(?:(?:(?:(?!\|}}).)*)(?:\n?))+)\|}}', '<table> \
-                                                                        <tbody> \
-                                                                            <tr> \
-                                                                                <td> \
-                                                                                    \g<in> \
-                                                                                </td> \
-                                                                            </tr> \
-                                                                        </tbody> \
-                                                                    </table>', data)
-    
-    data = re.sub('\[ruby\((?P<in>[^\,]*)\,\s?(?P<out>[^\)]*)\)\]', '<ruby> \
-                                                                        \g<in> \
-                                                                        <rp>(</rp> \
-                                                                        <rt>\g<out></rt> \
-                                                                        <rp>)</rp> \
-                                                                    </ruby>', data)
+    data = re.sub('{{\|(?P<in>(?:(?:(?:(?!\|}}).)*)(?:\n?))+)\|}}', '<table><tbody><tr><td>\g<in></td></tr></tbody></table>', data)
+    data = re.sub('\[ruby\((?P<in>[^\,]*)\,\s?(?P<out>[^\)]*)\)\]', '<ruby>\g<in><rp>(</rp><rt>\g<out></rt><rp>)</rp></ruby>', data)
     
     
     test = re.findall('\[\[wiki:([^|\]]+)(?:\|([^\]]+))?\]\]', data)
     test = re.findall('\[\[wiki:([^|\]]+)(?:\|([^\]]+))?\]\]', data)
     if(test):
     if(test):
@@ -731,7 +715,7 @@ def namumark(title, data, num, in_c, toc_y):
                     break
                     break
 
 
             end = re.sub("\n", '', end)
             end = re.sub("\n", '', end)
-            data = re.sub("(?:(?:(?:( +)\*\s([^\n]*))\n?)+)", '<ul style="margin-top: 10px;" id="list">' + end + '</ul>', data, 1)
+            data = re.sub("(?:(?:(?:( +)\*\s([^\n]*))\n?)+)", '<ul style="margin-top: 10px; margin-bottom: 10px;" id="list">' + end + '</ul>', data, 1)
         else:
         else:
             break
             break