Changeset 1761 for trunk/pylucid_project/PyLucid/system/markups/creole.py

Timestamp:

09/11/08 11:38:30 (18 months ago)

Author:

JensDiemer

Message:

-patch the creole markup, so it don't clashes with django template tags.
-Add a unitest and merge some parts from the tinxTextile markup test.

Files:

• trunk/pylucid_project/PyLucid/system/markups/creole.py (modified) (1 diff)

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

@@ -44 +44 @@
             ]]
         )'''
+
+    #--------------------------------------------------------------------------    
+    # PyLucid Patch:
+    # The image rule should not match on django template tags! So we make it
+    # more restricted.
+    # It matches only if...
+    # ...image target ends with a picture extention
+    # ...separator >|< and the image text exist
     image = r'''(?P<image>
             {{
-            (?P<image_target>.+?) \s*
-            ([|] \s* (?P<image_text>.+?) \s*)?
+            (?P<image_target>.+?\.jpg|\.jpeg|\.gif|\.png) \s*
+            (\| \s* (?P<image_text>.+?) \s*)?
             }}
-        )'''
+        )(?i)'''
+    #--------------------------------------------------------------------------
+
     macro = r'''(?P<macro>
             <<