X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=3e275e6f21c8a3fe5490a032cf5208b8e1abf7e8;hb=d25d749d6c737395c9076c2061c8088fedeb80bf;hp=ed53e83ab5d2ef4acaed3fde5b86e6e4d7321b7c;hpb=03f9943609343c4035886209f2e14b6ebdb6afb9;p=phdru.name%2Fphdru.name.git diff --git a/phd.py b/phd.py index ed53e83..3e275e6 100644 --- a/phd.py +++ b/phd.py @@ -9,7 +9,7 @@ def _url2href(match): return '%s' % (url, url) -full_dirs = len(os.getcwd().split('/')) + 2 +full_dirs = len(os.getcwd().split('/')) + 1 class phd(Template): def __init__(self, *args, **kw): @@ -39,11 +39,13 @@ class phd(Template): def body(self): if hasattr(self, "body_html"): - return self.body_html() + return self.body_html().encode('utf-8') if hasattr(self, "body_text"): return self.text2html() if hasattr(self, "body_rst"): return self.rst2html() + if hasattr(self, "body_mkd"): + return self.mkd2html() def text2html(self): body = re.sub(url_re, _url2href, self.body_text()) @@ -52,6 +54,8 @@ class phd(Template): new_paras = [] for p in paragraphs: + if isinstance(p, unicode): + p = p.encode('utf-8') parts = p.split("\n ") parts[0] = parts[0].strip() new_paras.append('\n
\n\n'.join(parts)) @@ -66,22 +70,30 @@ class phd(Template): def rst2html(self): from docutils.core import publish_parts - from m_lib.defenc import default_encoding as encoding parts = publish_parts(self.body_rst(), writer_name="html") - title = parts["title"].encode(encoding) or self.Title + title = parts["title"] or self.Title if title: title = "