Changeset 1769 for trunk/pylucid_project/PyLucid/system/markups/creole2html.py

Timestamp:

09/16/08 13:31:56 (18 months ago)

Author:

JensDiemer

Message:

• add a pass-through for normal django tags (not blocktags)
• Move creole markup above
• Update creole markup help and unittests

Files:

• trunk/pylucid_project/PyLucid/system/markups/creole2html.py (modified) (3 diffs)

trunk/pylucid_project/PyLucid/system/markups/creole2html.py

@@ -58 +58 @@
         print node
 
-
+from PyLucid.tools.utils import escape
 class HtmlEmitter:
     """
@@ -82 +82 @@
 
     def html_escape(self, text):
-        return text.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
+        return escape(text)
+        #return text.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
 
     def attr_escape(self, text):
@@ -205 +206 @@
         return u"<pre>\n%s\n</pre>\n" % self.html_escape(node.content)
 
-    def passthrough_emit(self, node):
+    def passthrough_block_emit(self, node):
         """ Pass-through all django template blocktags and html code lines """
         return node.content + "\n"
-    html_emit = passthrough_emit
+    html_emit = passthrough_block_emit
+
+    def passthrough_line_emit(self, node):
+        """ Pass-through all django template tags """
+        return node.content
 
     def default_emit(self, node):