WikiFormatting: add some support for WikiCreole (#4356) - `**` token for bold and `//` token for italic. Note that they should be matched by themselves, i.e. one can't use `'''` to match `**` or `''` to match `//` - `[[target]]` or `[[target|label]]` TracLinks. If `target` has to contain a `|` character, it must be wrapped in a string quote, as usual with TracLinks. The content of `[[]]` can't contain the `]]` substring. Note that support for the [[http://meta.wikimedia.org/wiki/Help:Piped_link#Pipe_trick|pipe trick]] is simply "emulated" (and to some extent only), as the wiki text is not converted before save. It is consistent with the removal of the scheme we do anyway. The reverse pipe trick is not operational yet. diff --git a/trac/wiki/formatter.py b/trac/wiki/formatter.py --- a/trac/wiki/formatter.py +++ b/trac/wiki/formatter.py @@ -408,10 +408,18 @@ class Formatter(object): def _bold_formatter(self, match, fullmatch): return self.simple_tag_handler(match, '', '') + # should be + + def _bold_wc_formatter(self, match, fullmatch): + return self.simple_tag_handler(match, '', '') + # should be def _italic_formatter(self, match, fullmatch): return self.simple_tag_handler(match, '', '') + def _italic_wc_formatter(self, match, fullmatch): + return self.simple_tag_handler(match, '', '') + def _underline_formatter(self, match, fullmatch): return self.simple_tag_handler(match, '', '') @@ -473,6 +481,9 @@ class Formatter(object): ns = fullmatch.group('lns') target = self._unquote(fullmatch.group('ltgt')) label = fullmatch.group('label') + return self._make_lhref_link(match, fullmatch, rel, ns, target, label) + + def _make_lhref_link(self, match, fullmatch, rel, ns, target, label): if not label: # e.g. `[http://target]` or `[wiki:target]` if target: if target.startswith('//'): # for `[http://target]` @@ -512,7 +523,8 @@ class Formatter(object): query = '&' + query.lstrip('?') return tag.a(label, href=path + query + fragment) else: - return self._make_link(ns, target, match, label, fullmatch) + return self._make_link(ns or 'wiki', target or '', match, label, + fullmatch) def _make_link(self, ns, target, match, label, fullmatch): # first check for an alias defined in trac.ini @@ -610,19 +622,39 @@ class Formatter(object): label = format_to_oneliner(self.env, self.context, label) return '%s' % (anchor, label) - # WikiMacros + # WikiMacros or WikiCreole links + + def _macrolink_formatter(self, match, fullmatch): + # check for a known [[macro]] + macro_or_link = match[2:-2] + fullmatch = WikiParser._macro_re.match(macro_or_link) + if fullmatch: + name = fullmatch.group('macroname') + args = fullmatch.group('macroargs') + macro = False # not a macro + macrolist = name[-1] == '?' + if name.lower() == 'br' or name == '?': + macro = None + else: + macro = WikiProcessor(self, (name, name[:-1])[macrolist]) + if macro.error: + macro = False + if macro is not False: + if macrolist: + macro = WikiProcessor(self, 'MacroList') + return self._macro_formatter(match, fullmatch, macro) + fullmatch = WikiParser._creolelink_re.match(macro_or_link) + return self._lhref_formatter(match, fullmatch) - def _macro_formatter(self, match, fullmatch): + def _macro_formatter(self, match, fullmatch, macro=None): name = fullmatch.group('macroname') if name.lower() == 'br': return '
' if name and name[-1] == '?': # Macro?() shortcut for MacroList(Macro) args = name[:-1] or '*' - name = 'MacroList' else: args = fullmatch.group('macroargs') try: - macro = WikiProcessor(self, name) return macro.process(args, in_paragraph=True) except Exception, e: self.env.log.error('Macro %s(%s) failed: %s' % @@ -1202,7 +1234,7 @@ class OneLinerFormatter(Formatter): def _table_row_sep_formatter(self, match, fullmatch): return '' - def _macro_formatter(self, match, fullmatch): + def _macro_formatter(self, match, fullmatch, macro=None): name = fullmatch.group('macroname') if name.lower() == 'br': return ' ' @@ -1265,7 +1297,7 @@ class OutlineFormatter(Formatter): # Avoid the possible side-effects of rendering WikiProcessors - def _macro_formatter(self, match, fullmatch): + def _macro_formatter(self, match, fullmatch, macro=None): return '' def handle_code_block(self, line, startmatch=None): diff --git a/trac/wiki/parser.py b/trac/wiki/parser.py --- a/trac/wiki/parser.py +++ b/trac/wiki/parser.py @@ -30,7 +30,9 @@ class WikiParser(Component): BOLDITALIC_TOKEN = "'''''" BOLD_TOKEN = "'''" + BOLD_TOKEN_WIKICREOLE = r"\*\*" ITALIC_TOKEN = "''" + ITALIC_TOKEN_WIKICREOLE = "//" UNDERLINE_TOKEN = "__" STRIKE_TOKEN = "~~" SUBSCRIPT_TOKEN = ",," @@ -63,7 +65,9 @@ class WikiParser(Component): # Font styles r"(?P!?%s)" % BOLDITALIC_TOKEN, r"(?P!?%s)" % BOLD_TOKEN, + r"(?P!?%s)" % BOLD_TOKEN_WIKICREOLE, r"(?P!?%s)" % ITALIC_TOKEN, + r"(?P!?%s)" % ITALIC_TOKEN_WIKICREOLE, r"(?P!?%s)" % UNDERLINE_TOKEN, r"(?P!?%s)" % STRIKE_TOKEN, r"(?P!?%s)" % SUBSCRIPT_TOKEN, @@ -71,7 +75,8 @@ class WikiParser(Component): r"(?P!?%s(?P.*?)%s)" \ % (STARTBLOCK_TOKEN, ENDBLOCK_TOKEN), r"(?P!?%s(?P.*?)%s)" \ - % (INLINE_TOKEN, INLINE_TOKEN)] + % (INLINE_TOKEN, INLINE_TOKEN), + ] # Rules provided by IWikiSyntaxProviders will be inserted here @@ -96,9 +101,8 @@ class WikiParser(Component): # [=#anchor] creation (r"(?P!?\[=#(?P%s)" % XML_NAME + "(?P\s+[^\]]*)?\])"), - # [[macro]] call - (r"(?P!?\[\[(?P[\w/+-]+\??|\?)" - r"(\]\]|\((?P.*?)\)\]\]))"), + # [[macro]] call or [[WikiCreole link]] + (r"(?P!?\[\[(?:[^]]|][^]])*\]\])"), # == heading == #hanchor r"(?P^\s*(?P={1,6})\s(?P.*?)" r"(?P#%s)?\s*$)" % XML_NAME, @@ -125,7 +129,28 @@ class WikiParser(Component): _startblock_re = re.compile(r"\s*%s(?:%s|\s*$)" % (STARTBLOCK, PROCESSOR)) _processor_param_re = re.compile(PROCESSOR_PARAM) - _anchor_re = re.compile('[^\w:.-]+', re.UNICODE) + _anchor_re = re.compile(r'[^\w:.-]+', re.UNICODE) + + _macro_re = re.compile(r''' + (?P [\w/+-]+ \?? | \? ) # macro, macro? or ? + (?: \( (?P .*? ) \) )? $ # optional arguments within () + ''', re.VERBOSE) + + _creolelink_re = re.compile(r''' + (?: + (?P %(rel)s ) # rel is "./..." or "/..." + | (?: (?P %(scheme)s ) : )? # lns is the optional "scheme:" + (?P # ltgt is the optional target + %(scheme)s : (?:%(quoted)s) # - "scheme:'...quoted..'" + | %(quoted)s # - "'...quoted...'" + | [^|]+ # - anything but a '|' + )? + ) + \s* (?: \| (?P