X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=mdwn2man;h=e4ba5aadfea3a04a00552a5cb90b81d34963aa9b;hb=cb3cb16d9cfa8480051b03fdf61cb22b964afdbd;hp=e78a4d18cf6da8046e9a998d4d7ff738deae6037;hpb=4b36dee35a55b08d6d6f3bb3840220a4956f2540;p=ikiwiki.git

diff --git a/mdwn2man b/mdwn2man
index e78a4d18c..e4ba5aadf 100755
--- a/mdwn2man
+++ b/mdwn2man
@@ -7,7 +7,9 @@ my $section=shift;
 print ".TH $prog $section\n";
 
 while (<>) {
-	s{(\\?)\[\[([^\s\]]+)\]\]}{$1 ? "[[$2]]" : $2}eg;
+	s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]]+)?\]\]}{$1 ? "[[$2]]" : $2}eg;
+	s/\`//g;
+	s/^\./\\&./g;
 	if (/^#\s/) {
 		s/^#\s/.SH /;
 		<>; # blank;
@@ -16,7 +18,6 @@ while (<>) {
 	s/-/\\-/g;
 	s/^Warning:.*//g;
 	s/^$/.PP\n/;
-	s/\`//g;
 	s/^\*\s+(.*)/.IP "$1"/;
 	next if $_ eq ".PP\n" && $skippara;
 	if (/^.IP /) {