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

Timestamp:

09/22/08 15:40:45 (18 months ago)

Author:

JensDiemer

Message:

add macro function to creole markup

Files:

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

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

@@ -41 +41 @@
 """
 
-import re
+import sys, re, traceback
+
 from creole import Parser
+
+import macros
+
+from PyLucid.tools.utils import escape
 
 class Rules:
@@ -53 +58 @@
         '''
 
-class Macro(object):
-#    def __init__(self):
-    def source_emit(self, node):
-        print node
-
-from PyLucid.tools.utils import escape
 class HtmlEmitter:
     """
@@ -70 +69 @@
         ]), re.X | re.U) # for addresses
 
-    def __init__(self, root):
+    def __init__(self, root, verbose=1, stderr=sys.stderr):
         self.root = root
-        self.macro = Macro()
+        self.verbose = verbose
+        self.stderr = stderr
 
     def get_text(self, node):
@@ -188 +188 @@
 
     def macro_emit(self, node):
-#        try:
-#            return getattr(self.macro, 
-        raise NotImplementedError("Node: %r" % node.content)
+        #print node.debug()
+        macro_name = node.macro_name
+        try:
+            macro = getattr(macros, macro_name)
+        except AttributeError, e:
+            return self.error(
+                u"Macro '%s' doesn't exist" % macro_name,
+                handle_traceback = True
+            )
+        
+        try:
+            result = macro(args=node.macro_args, text=node.content)
+        except Exception, err:
+            return self.error(
+                u"Macro '%s' error: %s" % (macro_name, err),
+                handle_traceback = True
+            )
+        
+        if not isinstance(result, unicode):
+            msg = u"Macro '%s' doesn't return a unicode string!" % macro_name
+            if self.verbose>1:
+                msg += " - returns: %r, type %r" % (result, type(result))
+            return self.error(msg)
+        
+        return result
 
     def break_emit(self, node):
@@ -206 +228 @@
         return u"<pre>\n%s\n</pre>\n" % self.html_escape(node.content)
 
-    def passthrough_block_emit(self, node):
+    def pass_block_emit(self, node):
         """ Pass-through all django template blocktags and html code lines """
         return node.content + "\n"
-    html_emit = passthrough_block_emit
-
-    def passthrough_line_emit(self, node):
+    pass_line_emit = pass_block_emit
+    html_emit = pass_block_emit
+
+    def pass_inline_emit(self, node):
         """ Pass-through all django template tags """
         return node.content
@@ -217 +240 @@
     def default_emit(self, node):
         """Fallback function for emitting unknown nodes."""
-        raise TypeError
+        raise NotImplementedError("Node '%s' unknown" % node.kind)
 
     def emit_children(self, node):
@@ -233 +256 @@
         return self.emit_node(self.root)
 
+    def error(self, text, handle_traceback=False):
+        """
+        Error Handling.
+        """
+        if self.verbose>1 and handle_traceback:
+            self.stderr.write(
+                "<pre>%s</pre>" % traceback.format_exc()
+            )
+        
+        if self.verbose>0:
+            return u"[Error: %s]" % text
+        else:
+            # No error output
+            return u""
+
 if __name__=="__main__":
     txt = r"""== a headline
@@ -260 +298 @@
 
 END"""
+
+    
+    txt = r"""
+==== Headline 1
+
+On {% a tag 1 %} line
+line two
+
+==== Headline 2
+
+{% a tag 2 %}
+
+A block:
+{% block %}
+<Foo:> {{ Bar }}
+{% endblock %}
+end block
+
+{% block1 arg="jo" %}
+eofjwqp
+{% endblock1 %}
+
+A block without the right end block:
+{% block1 %}
+111
+{% endblock2 %}
+BBB
+
+A block without endblock:
+{% block3 %}
+222
+{% block3 %}
+CCC
+
+the end"""
 
     print "-"*80