diff --git a/moin2doku.py b/moin2doku.py index eb69df1..4d33ef1 100755 --- a/moin2doku.py +++ b/moin2doku.py @@ -120,7 +120,7 @@ def convert_markup(content, filename): ('\[\[BR\]\]', '\n'), # newline ('#pragma section-numbers off', ''), # remove ('^##.*?\\n', ''), # comments: remove - ('^#(pragma|format|redirect|refresh|language)(.*)', ''), # remove all + ('^#(pragma|format|redirect|refresh|language|acl)(.*?)\n', ''), # remove all ('^#deprecated(.*)\n', 'This page is deprecated\n'), # deprecated # Other elements @@ -168,6 +168,7 @@ def convert_markup(content, filename): ('\'{5}(.*)\'{5}', '**//\\1//**'), # bold and italic ('\'{3}(.*)\'{3}', '**\\1**'), # bold ('\'{2}(.*)\'{2}', '//\\1//'), # italic + ('`(.+?)`', "''\\1''"), # monospaced ('(?