X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=phd.py;h=52f69370b61c4e932405eb8c170d2fb402255789;hb=d4a8101f56c22a7b3ac880252ef4caa349d68959;hp=e12fb902cb88599af9dfc49a13a361df6c4d9f0d;hpb=42465be8abac2fdb32c939bc7e5ad0fbca5df2f8;p=phdru.name%2Fphdru.name.git

diff --git a/phd.py b/phd.py
index e12fb90..52f6937 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())
@@ -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</p>\n<p>\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 = "<h1>%s</h1>" % title
 
-      subtitle = parts["subtitle"].encode(encoding)
+      subtitle = parts["subtitle"]
       if subtitle:
          subtitle = "<h2>%s</h2>" % 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 +121,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)