Changeset 1299

Timestamp:

10/30/07 16:31:54 (13 months ago)

Author:

JensDiemer

Message:

bugfixes for pygments.

Location:

trunk/pylucid/PyLucid

Files:

• system/hightlighter.py (modified) (4 diffs)
• tools/content_processors.py (modified) (1 diff)

trunk/pylucid/PyLucid/system/hightlighter.py

@@ -1 +1 @@
 
-from PyLucid.tools.content_processors import escape
+from PyLucid.tools.content_processors import escape, escape_django_tags
 
 from django.conf import settings
@@ -21 +21 @@
     '</fieldset>'
 )
+CSSCLASS = "pygments"
 
 def make_html(sourcecode, source_type):
@@ -54 +55 @@
 
     formatter = HtmlFormatter(
-        linenos=True, encoding="utf-8", style='colorful'
+        linenos=True, encoding="utf-8", style='colorful',
+        cssclass = CSSCLASS,
     )
 
-    stylesheet = formatter.get_style_defs('.pygments_code')
+    #stylesheet = formatter.get_style_defs(CSSCLASS)
 
 #    self.context["css_data"].append({
@@ -68 +70 @@
     html = out_object.getvalue()
 
+    # If there is e.g. html code with django tags, we must escape this:
+    html = escape_django_tags(html)
+
     return html, lexer_name
 

trunk/pylucid/PyLucid/tools/content_processors.py

@@ -149 +149 @@
 from xml.sax.saxutils import escape as sax_escape
 ENTITIES = {
-#    {% lucidTag RSS url="http url" title="a feed" %}
-    "{" : "{",
-    "}" : "}",
+    "{{" : "{{",
+    "}}" : "}}",
+    "{%" : "{%",
+    "%}" : "%}",
 }
 def escape(txt):