Changeset 86

Timestamp:

10/15/07 14:18:54 (15 months ago)

Author:

steadicat

Message:

Removed Smartypants from Versedown (use Typogrify instead in your templates).

Files:

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

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

@@ +1 @@
+import re, datetime
 from django import template
-from designed.contrib.smartypants import smartyPants as smartypants
-from designed.contrib.markdown import markdownWithFootnotes, markdown
-import re, datetime
+from django.template.defaultfilters import striptags
+#from smartypants import smartyPants as smartypants
+from markdown import markdownWithFootnotes, markdown as basicMarkdown
 
 register = template.Library()
@@ -18 +19 @@
 @register.filter
 def versedown(text):
-    return smartypants(reformatFootnotes(markdownWithFootnotes(reformatNewlines(text))))
+    return reformatFootnotes(markdownWithFootnotes(reformatNewlines(text)))
+
+@register.filter
+def markdownfn(text):
+    return reformatFootnotes(markdownWithFootnotes(text))
 
 @register.filter
 def markdown(text):
-    return smartypants(reformatFootnotes(markdownWithFootnotes(text)))
+    return basicMarkdown(text)
 
 @register.filter
 def linedown(text):
     """Markdown for titles. Removes extra <p></p>."""
-    return smartypants(markdown(text)[len(" <p>"):-len("\n </p> ")])
+    return markdown(text)[len(" <p>"):-len("\n </p> ")]
+
+@register.filter
+def stripdown(text):
+    """Remove markdown formatting and return plain text. For feed titles and stuff."""
+    return striptags(markdown(text))
 
 @register.filter
@@ -48 +58 @@
     """
     text = nn.sub(r"\n\n<p>&nbsp;</p>\n\n", text)
-    text = smartypants(markdown(text))
+    text = markdown(text)
     text = br.sub("<br />", text)
     text = n.sub("", text)