fix nesting for links spanning paragraphs

FIXME: Too greedy.  Incorrectly catches single paragraphs.

diff --git a/site/cgi-bin/modules/DevHelp/Formatter.pm b/site/cgi-bin/modules/DevHelp/Formatter.pm
index bde7f1f1cd689a6e42ca04eecafe77864d924dd9..645b83129d1c466936218b202a18b57036a7858c 100644 (file)
--- a/site/cgi-bin/modules/DevHelp/Formatter.pm
+++ b/site/cgi-bin/modules/DevHelp/Formatter.pm
@@ -380,9 +380,13 @@ sub format {
       1 while $part =~ s!</figure></p>!</p>\n</figure>!g;
       1 while $part =~ s/<p>(<figcaption(?: [^>]*)?>)/$1\n<p>/g;
       1 while $part =~ s!</figcaption></p>!</p>\n</figcaption>!g;
+      # remove unwanted paras from links spanning blocks
       1 while $part =~ s!<p>(<a\s[^>]+>)</p>!$1!g;
       1 while $part =~ s!<p></a></p>!</a>!g;
       1 while $part =~ s! ?(<a\s[^>]+>)</p>!</p>\n$1!g;
+      # wrap links spanning paras
+      1 while $part =~ s!<p>(<a\s[^>]+>)(.*?)</p>!$1<p>$2</p>!g;
+      1 while $part =~ s!<p>(.*?)</a></p>!<p>$1</p></a>!g;
       $part =~ s!<p>(<hr[^>]*>)</p>!$1!g;
       $part =~ s!<p>(<(?:table|ol|ul|center|h[1-6])[^>]*>)!$1!g;
       $part =~ s!(</(?:table|ol|ul|center|h[1-6])>)</p>!$1!g;