X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=d1821b1abcc93beed7d6b5bcdedccbacc2c623a3;hb=90c4a200cf90ab8ea15b5a8e1a746fd5196141a6;hp=1e34234998a569fbe621cc7256bdd76c521044ed;hpb=f4b02d689691b72b8078187f69b199f226298a9a;p=phdru.name%2Fphdru.name.git

diff --git a/phd.py b/phd.py
index 1e34234..d1821b1 100644
--- a/phd.py
+++ b/phd.py
@@ -9,7 +9,7 @@ def _url2href(match):
    return '<a href="%s">%s</a>' % (url, url)
 
 
-full_dirs = len(os.getcwd().split('/')) + 2
+full_dirs = len(os.getcwd().split('/')) + 1
 
 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())
@@ -78,9 +80,18 @@ class phd(Template):
          subtitle = "<h2>%s</h2>" % subtitle
 
       body = parts["body"]
-      parts = [part for part in (title, subtitle, body) if part]
+      parts = []
+      for part in (title, subtitle, body):
+          if not part:
+              continue
+          if isinstance(part, unicode):
+              part = part.encode('utf-8')
+          parts.append(part)
       return "\n\n".join(parts)
 
+   def mkd2html(self):
+      from markdown import markdown
+      return markdown(self.body_mkd(), output_format="html")
 
    def img_thumbnail_800_1024(self, img_name):
       return """\