Support Markdown

[phdru.name/phdru.name.git] / phd.py

diff --git a/phd.py b/phd.py
index ed53e83ab5d2ef4acaed3fde5b86e6e4d7321b7c..f34437a9af1b647e5f3078f6978a0c14bd91ac67 100644 (file)
--- a/phd.py
+++ b/phd.py
@@ -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 = "<h1>%s</h1>" % title
 
-      subtitle = parts["subtitle"].encode(encoding)
+      subtitle = parts["subtitle"]
       if subtitle:
          subtitle = "<h2>%s</h2>" % subtitle
 
-      body = parts["body"].encode(encoding)
+      body = parts["body"]
       parts = [part for part in (title, subtitle, body) if 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 """\