Changeset 3266

Timestamp:

11/05/08 12:43:12 (5 years ago)

Author:

moschny

Message:

Make the list of "allowed" (i.e. expanded) macros in the toc configurable.

File:

• trac/plugins/tracnav-0.11/tracnav/tracnav.py (modified) (6 diffs)

trac/plugins/tracnav-0.11/tracnav/tracnav.py

@@ -70 +70 @@
 TRACNAVHOME = "http://svn.ipd.uka.de/trac/javaparty/wiki/TracNav"
 LISTRULE = re.compile(r"^(?P<indent>[ \t\v]+)\* +(?P<rest>.*)$", re.M)
-ALLOWED_MACROS = ["image"]
 
 
@@ -78 +77 @@
     last wiki link.
     """
-    def __init__(self, env, ctx):
+    def __init__(self, env, ctx, allowed_macros=[]):
         OneLinerFormatter.__init__(self, env, ctx)
         self.lastlink = None
+        self.allowed_macros = allowed_macros
 
     def format_toc(self, wikitext):
@@ -95 +95 @@
 
     def _macro_formatter(self, match, fullmatch):
-        name = fullmatch.group('macroname').lower()
-        if name in ALLOWED_MACROS:
+        name = fullmatch.group('macroname')
+        if name in self.allowed_macros:
             # leapfrog the OneLinerFormatter
             return Formatter._macro_formatter(self, match, fullmatch)
@@ -125 +125 @@
         self.collapse = True
         self.reorder = True
+        self.allowed_macros = 'Image'
         if args:
-            for arg in map(lambda a: a.strip(), args.split('|')):
+            for arg, _, values in map(lambda s: s.partition('='), args.split('|')):
+                arg = arg.strip()
                 if arg == 'nocollapse':
                     self.collapse = False
@@ -133 +135 @@
                 elif arg == 'noreorder':
                     self.reorder = False
+                elif arg == 'allowed_macros':
+                    self.allowed_macros = map(lambda s: s.strip(), values.split(','))
                 else:
                     self.names.append(arg)
@@ -151 +155 @@
         Parse and format the entries in toc_text.
         """
-        formatter = TocFormatter(self.env, self.ctx)
+        formatter = TocFormatter(self.env, self.ctx, self.allowed_macros)
         for match in LISTRULE.finditer(toc_text):
             indent = len(match.group('indent'))