Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / mdwn2man

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