Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / mdwn2man

diff --git a/mdwn2man b/mdwn2man
index 86a524bd648a02c4b21aae545a0e156b622eb03d..e4ba5aadfea3a04a00552a5cb90b81d34963aa9b 100755 (executable)
--- a/mdwn2man
+++ b/mdwn2man
@@ -7,7 +7,9 @@ my $section=shift;
 print ".TH $prog $section\n";
 
 while (<>) {
 print ".TH $prog $section\n";
 
 while (<>) {

-       s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]])?\]\]}{$1 ? "[[$2]]" : $2}eg;
+       s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]]+)?\]\]}{$1 ? "[[$2]]" : $2}eg;
+       s/\`//g;
+       s/^\./\\&./g;

        if (/^#\s/) {
                s/^#\s/.SH /;
                <>; # blank;
        if (/^#\s/) {
                s/^#\s/.SH /;
                <>; # blank;


@@ -16,7 +18,6 @@ while (<>) {
        s/-/\\-/g;
        s/^Warning:.*//g;
        s/^$/.PP\n/;
        s/-/\\-/g;
        s/^Warning:.*//g;
        s/^$/.PP\n/;

-       s/\`//g;

        s/^\*\s+(.*)/.IP "$1"/;
        next if $_ eq ".PP\n" && $skippara;
        if (/^.IP /) {
        s/^\*\s+(.*)/.IP "$1"/;
        next if $_ eq ".PP\n" && $skippara;
        if (/^.IP /) {