systemausfall.org/moin2doku
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixing wiki: links, monispaced text can be empty

Browse source
This commit is contained in:
Elan Ruusamäe 2011-02-06 23:42:58 +02:00
parent c01500ce19
commit ef65e1094a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
moin2doku.py
View file

@ -137,10 +137,12 @@ def convert_markup(content, filename):
# ('"\]', ']]'), # internal link close # ('"\]', ']]'), # internal link close
# internal links # internal links
('\[:(.+)\]', '[[\\1]]'), ('\[:(.+)\]', '[[\\1]]'),
# wiki:xxx
('\[wiki:([^\s]+)\s+(.+)\]', '[[\\1|\\2]]'),
# TODO: handle more depths # TODO: handle more depths
('\[\[(.*)/(.*)\]\]', '[[\\1:\\2]]'), ('\[\[(.*)/(.*)\]\]', 'B[[\\1:\\2]]'),
# wiki:xxx
('\[wiki:([^\s]+)\s+(.+)]', '[[\\1|\\2]]'),
('wiki:([^\s]+)\s+(.+)', '[[\\1|\\2]]'),
('wiki:([^\s]+)', '[[\\1]]'),
('(\[\[.+\]\]).*\]', '\\1'), ('(\[\[.+\]\]).*\]', '\\1'),
# web link without title # web link without title
@ -175,7 +177,7 @@ def convert_markup(content, filename):
('\'{5}(.*)\'{5}', '**//\\1//**'), # bold and italic ('\'{5}(.*)\'{5}', '**//\\1//**'), # bold and italic
('\'{3}(.*)\'{3}', '**\\1**'), # bold ('\'{3}(.*)\'{3}', '**\\1**'), # bold
('\'{2}(.*)\'{2}', '//\\1//'), # italic ('\'{2}(.*)\'{2}', '//\\1//'), # italic
('`(.+?)`', "''\\1''"), # monospaced ('`(.*?)`', "''\\1''"), # monospaced
('(?<!\[)(\b[A-Z]+[a-z]+[A-Z][A-Za-z]*\b)','[[\\1]]'), # CamelCase, dont change if CamelCase is in InternalLink ('(?<!\[)(\b[A-Z]+[a-z]+[A-Z][A-Za-z]*\b)','[[\\1]]'), # CamelCase, dont change if CamelCase is in InternalLink
('\[\[Date\(([\d]{4}-[\d]{2}-[\d]{2}T[\d]{2}:[\d]{2}:[\d]{2}Z)\)\]\]', '\\1'), # Date value ('\[\[Date\(([\d]{4}-[\d]{2}-[\d]{2}T[\d]{2}:[\d]{2}:[\d]{2}Z)\)\]\]', '\\1'), # Date value
('attachment:(.*)','{{'+namespace+'\\1|}}') ('attachment:(.*)','{{'+namespace+'\\1|}}')