Changeset 1500

Timestamp:

03/24/08 12:48:32 (8 months ago)

Author:

JensDiemer

Message:

tinyTextile: Add permalink and anchor to every headline.

Location:

trunk/pylucid

Files:

• PyLucid/system/tinyTextile.py (modified) (3 diffs)
• PyLucid/tools/content_processors.py (modified) (1 diff)
• tests/test_tinyTextile.py (modified) (6 diffs)
• tests/__init__.py (modified) (1 diff)

trunk/pylucid/PyLucid/system/tinyTextile.py

@@ -28 +28 @@
 __version__ = "$Rev$"
 
-import sys, re
+import sys, re, string
+
 from PyLucid.tools.utils import escape
 from PyLucid.system.response import SimpleStringIO
 
 
+HEADLINE = (
+    '<h%(no)s id="%(anchor)s">'
+    '<a title="Link to this section" href="%(link)s#%(anchor)s" class="anchor">'
+    '%(txt)s</a>'
+    '</h%(no)s>\n'
+)
+
+
 class TinyTextileParser:
-    def __init__(self, out_obj, context):
+    def __init__(self, out_obj, permalink, context):
         self.out = out_obj
+        self.permalink = permalink
         self.context = context
         self.page_msg   = context["page_msg"]
 
-        # Regeln für Blockelemente
+        # Blockelements
         self.block_rules = self._compile_rules([
-            [ # <h1>-Überschriften
-                r"\Ah(\d)\. +(.*)(?us)",
-                r"<h\1>\2</h\1>"
+            [ # <h1>-Headlines
+                r"\Ah(\d)\. (.+)(?usm)",
+                self.headline
             ],
         ])
 
-        # Regeln für Inlineelemente
+        # Inlineelements
         self.inline_rules = self._compile_rules([
             [ # HTML-Escaping
@@ -155 +165 @@
     def escaping(self, matchobj):
         return escape(matchobj.group(1))
+
+    def headline(self, matchobj):
+        """
+        Insert a html headline with a anchor.
+        """
+        text = matchobj.group(2)
+        anchor = "".join(
+            [char for char in text if char in string.ascii_letters]
+        )
+        result = HEADLINE % {
+            "no": matchobj.group(1),
+            "txt": text,
+            "link": self.permalink,
+            "anchor": anchor,
+        }
+        return result
 
     def shortcutLink(self, matchobj):
@@ -422 +448 @@
 
 
-

trunk/pylucid/PyLucid/tools/content_processors.py

@@ -46 +46 @@
         from PyLucid.system.tinyTextile import TinyTextileParser
         out_obj = SimpleStringIO()
-        markup_parser = TinyTextileParser(out_obj, context)
+
+        current_page = context["PAGE"]
+        permalink = current_page.get_permalink()
+
+        markup_parser = TinyTextileParser(out_obj, permalink, context)
         markup_parser.parse(content)
         content = out_obj.getvalue()

trunk/pylucid/tests/test_tinyTextile.py

@@ -36 +36 @@
 VERBOSE = 2
 
+PERMALINK = "/permalink/"
 
 
@@ -112 +113 @@
         self.fake_context = get_fake_context()
         self.out = SimpleStringIO()
-        self.textile = TinyTextileParser(self.out, self.fake_context)
+        self.textile = TinyTextileParser(self.out, PERMALINK, self.fake_context)
 
     def tearDown(self):
@@ -125 +126 @@
         """
         txt = txt.splitlines()
-        assert txt[0]=="", "First must be empty!" 
+        assert txt[0]=="", "First must be empty!"
         txt = txt[1:] # Skip the first line
 
@@ -200 +201 @@
         self.textile.parse(content)
         self.assertEqual(self.out.getvalue(),out_test)
-        
+
     def testTextile_text3(self):
         test_text = self._prepare_text("""
@@ -233 +234 @@
     def testTextile_headline1(self):
         content = self._prepare_text("""
-            h1. h-1 headline
-
-            h2. h-2 headline
-        """)
-        out_test = self._prepare_text("""
-            <h1>h-1 headline</h1>
-            <h2>h-2 headline</h2>
-
+            h1. headline A
+            
+            Text1
+
+            h2. headline B $%#
+            
+            Text2
+        """)
+        out_test = self._prepare_text("""
+            <h1 id="headlineA"><a title="Link to this section" href="/permalink/#headlineA" class="anchor">headline A</a></h1>
+            
+            <p>Text1</p>
+            <h2 id="headlineB"><a title="Link to this section" href="/permalink/#headlineB" class="anchor">headline B $%#</a></h2>
+            
+            <p>Text2</p>
+        
         """)
 
@@ -380 +389 @@
         self.textile.parse(content)
         self.assertEqual(self.out.getvalue(),out_test)
-        
+
     def testTextile_escaping2(self):
         content = self._prepare_text("""

trunk/pylucid/tests/__init__.py

@@ -192 +192 @@
     HREF_RE = re.compile('<a href="(.+?)".*?>(.+?)</a>')
 
-    def assertResponse(self, response, must_contain, must_not_contain=()):
+    def assertResponse(self, response, must_contain=(), must_not_contain=()):
         """
         Check the content of the response