X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=f34437a9af1b647e5f3078f6978a0c14bd91ac67;hb=c978d4eac730a7fa0d578c4946fcc88854ba8aef;hp=e12fb902cb88599af9dfc49a13a361df6c4d9f0d;hpb=42465be8abac2fdb32c939bc7e5ad0fbca5df2f8;p=phdru.name%2Fphdru.name.git diff --git a/phd.py b/phd.py index e12fb90..f34437a 100644 --- a/phd.py +++ b/phd.py @@ -9,7 +9,7 @@ def _url2href(match): return '%s' % (url, url) -full_dirs = len(os.getcwd().split('/')) + 1 +full_dirs = len(os.getcwd().split('/')) + 2 class phd(Template): def __init__(self, *args, **kw): @@ -44,6 +44,8 @@ class phd(Template): 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()) @@ -66,22 +68,24 @@ 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 = "