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):
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())
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 """\
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)