X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=d1821b1abcc93beed7d6b5bcdedccbacc2c623a3;hb=3ad71cc17bfa574b6b0725895c344d6a88d07a47;hp=e12fb902cb88599af9dfc49a13a361df6c4d9f0d;hpb=42465be8abac2fdb32c939bc7e5ad0fbca5df2f8;p=phdru.name%2Fphdru.name.git
diff --git a/phd.py b/phd.py
index e12fb90..d1821b1 100644
--- 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,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 = "
%s
" % title
- subtitle = parts["subtitle"].encode(encoding)
+ subtitle = parts["subtitle"]
if subtitle:
subtitle = "%s
" % subtitle
- body = parts["body"].encode(encoding)
- parts = [part for part in (title, subtitle, body) if part]
+ body = parts["body"]
+ 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 """\
@@ -109,4 +119,4 @@ class phd(Template):
return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
def quote_string(s, to_encoding="utf-8", ext_safe=''):
- return urllib.quote(unicode(s, "koi8-r").encode(to_encoding), '/' + ext_safe)
+ return urllib.quote(unicode(s, "utf-8").encode(to_encoding), '/' + ext_safe)