From eca811ec09db5be4892461ad46cd44e904025497 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 14 Feb 2021 22:14:27 +0000 Subject: Still more borked links --- trac2md.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'trac2md.py') diff --git a/trac2md.py b/trac2md.py index 9a41d1c..6645bc7 100755 --- a/trac2md.py +++ b/trac2md.py @@ -15,7 +15,7 @@ from datetime import datetime from urllib.parse import quote wikilink_1_pattern = re.compile("\[\[(http.*)\]\]|\[(http.*)\]") -wikilink_2_pattern = re.compile("\[\[([a-zA-Z0-9_]+)\]\]") +wikilink_2_pattern = re.compile("\[\[(?:wiki:)?([a-zA-Z0-9_]+)\]\]|\[wiki:([a-zA-Z0-9_]+)\]") strikethrough_pattern = re.compile("~~(.*)~~") camelcase_pattern = re.compile("!(\w+)") image_pattern = re.compile("\[\[Image\((.*)\)\]\]") @@ -91,7 +91,7 @@ def convert_wikilinks_2(line): ''' Convert more wiki links''' m = wikilink_2_pattern.search(line) if m: - text = m.group(1) + text = m.group(1) or m.group(2) if text.lower() == "pageoutline": mdlink = "" else: -- cgit v1.2.3