diff --git a/mimetex.cgi b/mimetex.cgi new file mode 100755 index 0000000..00ad454 Binary files /dev/null and b/mimetex.cgi differ diff --git a/pylog_action_impl.py b/pylog_action_impl.py index 6f7f6dd..b0b0c3d 100644 --- a/pylog_action_impl.py +++ b/pylog_action_impl.py @@ -3,10 +3,7 @@ import urllib from datetime import datetime import pylog_config as cfg import subprocess,tempfile -try: - import markdown -except: - import markdown2 as markdown +import markdown from HTMLParser import HTMLParser @@ -37,7 +34,7 @@ def file_link(name,f,depth,hidden): def disp_txt(path): print '
' f = open(path) - print markdown.markdown(f.read()) + print markdown.markdown(f.read(),extensions=['math']) f.close() print '
' @@ -138,7 +135,7 @@ def prev(path): def prev_txt(path): fi = open(path) txt=get_n_words(fi,40) - print '
'+markdown.markdown(txt[0]) + print '
'+markdown.markdown(txt[0],extensions=['math']) if txt[1]: print ' ...' print '
' diff --git a/pylog_latex.py b/pylog_latex.py deleted file mode 100644 index e539d58..0000000 --- a/pylog_latex.py +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/python -import os,sys,re - -import urllib, cgi - -import cgitb -cgitb.enable() -form = cgi.FieldStorage() - -# blacklist taken from wp-latex: -# http://wordpress.org/extend/plugins/wp-latex/ -blacklist=['^^',\ - 'afterassignment',\ - 'aftergroup',\ - 'batchmode',\ - 'catcode',\ - 'closein',\ - 'closeout',\ - 'command',\ - 'csname',\ - 'document',\ - 'def',\ - 'errhelp',\ - 'errcontextlines',\ - 'errorstopmode',\ - 'every',\ - 'expandafter',\ - 'immediate',\ - 'include',\ - 'input',\ - 'jobname',\ - 'loop',\ - 'lowercase',\ - 'makeat',\ - 'meaning',\ - 'message',\ - 'name',\ - 'newhelp',\ - 'noexpand',\ - 'nonstopmode',\ - 'open',\ - 'output',\ - 'pagestyle',\ - 'package',\ - 'pathname',\ - 'read',\ - 'relax',\ - 'repeat',\ - 'shipout',\ - 'show',\ - 'scrollmode',\ - 'special',\ - 'syscall',\ - 'toks',\ - 'tracing',\ - 'typeout',\ - 'typein',\ - 'uppercase',\ - 'write'] - -sys.stdout.write('Content-type: image/png\n\n') -badtex() -latex = "$$p_n=\\frac{\\pi}{n^2}$$" - -def badtex(): - f=open('_img/badtex.png','rb') - sys.stdout.write(f.read()) - f.close() - sys.exit(0) - -for word in blacklist: - if word in latex: - badtex() - -if re.search("/(^|[^\\\\])\$/",latex): - badtex() - sys.exit(0) - - -