Changeset 10686

Timestamp:

Sep 26, 2011, 9:05:11 AM (9 years ago)

Author:

Álvaro Iradier

Message:

Version 1.9.2. Added omit_macro option to specify a list of macro names to omit in PDF generation. Closes #7374

Location:

tracwikiprintplugin/0.11

Files:

• setup.py (modified) (1 diff)
• wikiprint/wikiprint.py (modified) (3 diffs)

tracwikiprintplugin/0.11/setup.py

@@ -8 +8 @@
 setup(
     name = 'TracWikiPrintPlugin',
-    version = '1.9.1',
+    version = '1.9.2',
     packages = ['wikiprint'],
     package_data={ 'wikiprint' : [ 'templates/*', 'htdocs/js/*' ] },

tracwikiprintplugin/0.11/wikiprint/wikiprint.py

@@ -17 +17 @@
 from trac.web.href import Href
 from trac.web.api import IAuthenticator
-from trac.config import Option, BoolOption
+from trac.config import Option, BoolOption, ListOption
 import os
 import re
@@ -146 +146 @@
     httpauth_password = Option('wikiprint', 'httpauth_password')
     omit_links = BoolOption('wikiprint', 'omit_links')
+    omit_macros = ListOption('wikiprint', 'omit_macros')
     rebase_links = Option('wikiprint', 'rebase_links')
     default_charset = Option('trac', 'default_charset', 'utf-8')
@@ -187 +188 @@
         for r in [re.compile(r'\[\[TOC(\(.*\))?\]\]'), re.compile(r'\[\[PageOutline(\(.*\))?\]\]')]:
             text = r.sub('![[pdf-toc]]', text)
+            
+        for macro in self.omit_macros:
+            r = re.compile(r'\[\[' + macro + r'\(.*?\]\]')
+            text = r.sub('', text)
+            r = re.compile(r'^\{\{\{\r?\n#!' + macro + r'\r?\n(^.*\r?\n)*?^\}\}\}', re.MULTILINE)
+            text = r.sub('', text)
 
         link_format = req.args.get('link_format', None)