2
0
ect (or 2du) 8 жил өмнө
parent
commit
34c6a38530
1 өөрчлөгдсөн 16 нэмэгдсэн , 5 устгасан
  1. 16 5
      set_mark/start.py

+ 16 - 5
set_mark/start.py

@@ -494,7 +494,13 @@ def start(conn, data, title):
         math = re.search('<math>((?:(?!<\/math>).)+)<\/math>', data)
         if math:
             if first == 0:
-                plus_data += '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0/katex.min.css" integrity="sha384-TEMocfGvRuD1rIAacqrknm5BQZ7W7uWitoih+jMNFXQIbNl16bO8OZmylH/Vi/Ei" crossorigin="anonymous"><script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0/katex.min.js" integrity="sha384-jmxIlussZWB7qCuB+PgKG1uLjjxbVVIayPJwi6cG6Zb4YKq0JIw+OMnkkEC7kYCq" crossorigin="anonymous"></script>'
+                plus_data += '''
+                            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0/katex.min.css"
+                                integrity="sha384-TEMocfGvRuD1rIAacqrknm5BQZ7W7uWitoih+jMNFXQIbNl16bO8OZmylH/Vi/Ei"
+                                crossorigin="anonymous">
+                            <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0/katex.min.js" 
+                                integrity="sha384-jmxIlussZWB7qCuB+PgKG1uLjjxbVVIayPJwi6cG6Zb4YKq0JIw+OMnkkEC7kYCq"
+                                crossorigin="anonymous"></script>'''
 
             math = math.groups()[0]
             
@@ -920,7 +926,12 @@ def start(conn, data, title):
                 footnote_all.sort()
                 
                 for footdata in footnote_all:
-                    footdata_all += '<li><a href="#rfn-' + footdata[0] + '" id="fn-' + footdata[0] + '">(' + footdata[1] + ')</a> ' + footdata[2] + '</li>'
+                    if footdata[2] == 0:
+                        footdata_in = ''
+                    else:
+                        footdata_in = footdata[2]
+
+                    footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '" id="fn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> ' + footdata_in + '</li>'
                 
                 data = re.sub('(?:\[\*((?:(?! ).)*) ((?:(?!\]).)+)\]|(\[각주\]))', footdata_all + '</ul>', data, 1)
                 
@@ -936,7 +947,7 @@ def start(conn, data, title):
                         foot_plus_num = str(footnote_re[footnote_name])
                         footshort = footnote_dict[footnote_name] + '.' + foot_plus_num
 
-                        footnote_all += [[footshort, footshort, 0]]
+                        footnote_all += [[float(footshort), footshort, 0]]
 
                         data = re.sub('(?:\[\*((?:(?! |\]).)*)(?: ((?:(?!\]).)+))?\]|(\[각주\]))', '<sup><a href="#fn-' + footshort + '" id="rfn-' + footshort + '">(' + footshort + ')</a></sup>', data, 1)
                     else:
@@ -954,7 +965,7 @@ def start(conn, data, title):
                     else:
                         footnote_re[footnote_name] += 1
 
-                    footnote_all += [[str(footnote_number), footnote_name, footnote]]
+                    footnote_all += [[footnote_number, footnote_name, footnote]]
                     
                     data = re.sub('(?:\[\*((?:(?! |\]).)*)(?: ((?:(?!\]).)+))?\]|(\[각주\]))', '<sup><a href="#fn-' + str(footnote_number) + '" id="rfn-' + str(footnote_number) + '">(' + footnote_name + ')</a></sup>', data, 1)
         else:
@@ -970,7 +981,7 @@ def start(conn, data, title):
         else:
             footdata_in = footdata[2]
 
-        footdata_all += '<li><a href="#rfn-' + footdata[0] + '" id="fn-' + footdata[0] + '">(' + footdata[1] + ')</a> ' + footdata_in + '</li>'
+        footdata_all += '<li><a href="#rfn-' + str(footdata[0]) + '" id="fn-' + str(footdata[0]) + '">(' + footdata[1] + ')</a> ' + footdata_in + '</li>'
 
     footdata_all += '</ul>'
     if footdata_all == '\n<hr><ul id="footnote_data"></ul>':