Changeset 109 for django/trunk/contrib

Timestamp:

01/13/08 02:39:43 (12 months ago)

Author:

steadicat

Message:

Fixed to work with the latest Django.

Files:

• django/trunk/contrib/versedown/templatetags/versedown.py (modified) (3 diffs)

django/trunk/contrib/versedown/templatetags/versedown.py

@@ -2 +2 @@
 from django import template
 from django.template.defaultfilters import striptags
-#from smartypants import smartyPants as smartypants
+from django.utils.safestring import mark_safe
+from typogrify import typogrify
 from markdown import markdownWithFootnotes, markdown as basicMarkdown
 
@@ -19 +20 @@
 @register.filter
 def versedown(text):
-    return reformatFootnotes(markdownWithFootnotes(reformatNewlines(text)))
+    return mark_safe(typogrify(reformatFootnotes(markdownWithFootnotes(reformatNewlines(text)))))
 
 @register.filter
 def markdownfn(text):
-    return reformatFootnotes(markdownWithFootnotes(text))
+    return mark_safe(typogrify(reformatFootnotes(markdownWithFootnotes(text))))
 
 @register.filter
 def markdown(text):
-    return basicMarkdown(text)
+    return mark_safe(typogrify(basicMarkdown(text)))
 
 @register.filter
 def linedown(text):
     """Markdown for titles. Removes extra <p></p>."""
-    return markdown(text)[len(" <p>"):-len("\n </p> ")]
+    return mark_safe(markdown(text)[len(" <p>"):-len(" \n</p>")])
+
+@register.filter
+def linedownfn(text):
+    return mark_safe(markdownfn(text)) # todo: strip extra <p>s
 
 @register.filter
 def stripdown(text):
     """Remove markdown formatting and return plain text. For feed titles and stuff."""
-    return striptags(markdown(text))
+    return mark_safe(striptags(basicMarkdown(text)))
 
 @register.filter
@@ -58 +63 @@
     """
     text = nn.sub(r"\n\n<p>&nbsp;</p>\n\n", text)
-    text = markdown(text)
+    text = basicMarkdown(text)
     text = br.sub("<br />", text)
     text = n.sub("", text)
-    return text
+    return mark_safe(text)
 
 if __name__ == "__main__":
     import doctest
     doctest.testmod()
+
+@register.filter
+def truncatelines(text, lines):
+    return '\n'.join(text.splitlines()[:lines])