From cd878ed275ad8d9c8fd047863e5e687d13e87578 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 15 Feb 2021 03:06:11 +0000 Subject: One more tiny link tweak --- pelican/content/UpgradeToKSNG.md | 2 +- trac2md.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pelican/content/UpgradeToKSNG.md b/pelican/content/UpgradeToKSNG.md index 99b88ed..1da622c 100644 --- a/pelican/content/UpgradeToKSNG.md +++ b/pelican/content/UpgradeToKSNG.md @@ -161,7 +161,7 @@ cryptech> masterkey set If the above procedure somehow goes horribly wrong and bricks your alpha, you can still recover, but you'll need an ST-LINK programmer. -There's some discussion of this at [[GitRepositories/sw/stm32]](GitRepositories/sw/stm32]). +There's some discussion of this at [GitRepositories/sw/stm32](GitRepositories/sw/stm32). Possible sources for the ST-LINK programmer and a suitable cable: diff --git a/trac2md.py b/trac2md.py index 9d002dc..249ddaa 100755 --- a/trac2md.py +++ b/trac2md.py @@ -17,8 +17,8 @@ from urllib.parse import quote image_pattern = re.compile(r"\[\[Image\((.*)\)\]\]") wikilink_1_pattern = re.compile(r"\[\[(http.*)\]\]|\[(http.*)\]") -wikilink_2_pattern = re.compile(r"\[\[attachment:([a-zA-Z0-9_]+)\]\]|\[attachment:(.+)\]") -wikilink_3_pattern = re.compile(r"\[\[(?:wiki:)?([a-zA-Z0-9_]+)\]\]|\[wiki:(.+)\]") +wikilink_2_pattern = re.compile(r"\[\[attachment:([a-zA-Z0-9_/]+)\]\]|\[attachment:(.+)\]") +wikilink_3_pattern = re.compile(r"\[\[(?:wiki:)?([a-zA-Z0-9_/]+)\]\]|\[wiki:(.+)\]") strikethrough_pattern = re.compile(r"~~(.*)~~") camelcase_pattern = re.compile(r"!((?:\w|[#])+)") -- cgit v1.2.3