diff -ru firedrop2.old/publisher.py firedrop2/publisher.py
--- firedrop2.old/publisher.py	2006-05-30 00:33:56.000000000 +0200
+++ firedrop2/publisher.py	2007-03-31 13:31:21.000000000 +0200
@@ -182,7 +182,7 @@
 
     def render_entry(self, entry):
         """ Canonical entry renderer. """
-        return renderer.render(entry, self.entry_template, self.namespace)
+        return renderer.render(entry, self.entry_template, self.namespace, options=None, macros=self.macros)
 
 
     def render_page(self, pagename=""):
@@ -379,4 +379,4 @@
 Added index_template methods and text.
 - midtoad
 
-"""
\ Kein Zeilenumbruch am Dateiende.
+"""
diff -ru firedrop2.old/renderer.py firedrop2/renderer.py
--- firedrop2.old/renderer.py	2006-03-26 18:38:20.000000000 +0200
+++ firedrop2/renderer.py	2007-03-31 13:43:45.000000000 +0200
@@ -5,6 +5,7 @@
 import rest
 import sextile
 import textile
+import textmacros
 
 MARKDOWN_COMMENT = "<!-- Markdown -->\n"
 REST_COMMENT     = "<!-- ReST -->\n"
@@ -14,16 +15,17 @@
 debug = 0   # set debug level: 0 none, 1 critical, 2 informative, 3 all
 
 
-def render(entry, entry_template, namespace, options=None):
+def render(entry, entry_template, namespace, options=None, macros={}):
     if options is None:
         options = {}
     options['id'] = entry.get_id()
+    entry_body = textmacros.replace_all(entry.body, macros, ignore_errors=1)
     try:
-        print "options", options
+        # print "options", options
         if entry.is_textile():
-            entry_body = TEXTILE_COMMENT + textile.textile(entry.body[1:].lstrip()) #, **options)
+            entry_body = TEXTILE_COMMENT + textile.textile(entry_body[1:].lstrip()) #, **options)
         elif entry.is_markdown():
-            entry_body = MARKDOWN_COMMENT + markdown.markdownWithFootnotes(entry.body[2:]) #, options)
+            entry_body = MARKDOWN_COMMENT + markdown.markdownWithFootnotes(entry_body[2:]) #, options)
             if debug > 2:
                 print "in renderer.py, received options:\n%s" % options
                 import time
@@ -33,11 +35,9 @@
                 f1.close()
 
         elif entry.is_rest():
-            entry_body = REST_COMMENT + rest.rest(entry.body[2:], options)
+            entry_body = REST_COMMENT + rest.rest(entry_body[2:], options)
         elif entry.is_sextile():
-            entry_body = SEXTILE_COMMENT + sextile.sextile(entry.body[2:], options)
-        else:
-            entry_body = entry.body
+            entry_body = SEXTILE_COMMENT + sextile.sextile(entry_body[2:], options)
         namespace['entry_body'] = entry_body
         #
         rendered_entry = embedded_code.render_well(entry_template, namespace)