allow "class[foo|class[bar|text]]" class to be promoted to paragraph

this (still) doesn't require strict nesting of spans

diff --git a/site/cgi-bin/modules/DevHelp/Formatter.pm b/site/cgi-bin/modules/DevHelp/Formatter.pm
index 04b77672236444f6020eea331453a68d61e14b07..9a4191ea61f59c382a498c29b1b8aab65017e37d 100644 (file)
--- a/site/cgi-bin/modules/DevHelp/Formatter.pm
+++ b/site/cgi-bin/modules/DevHelp/Formatter.pm
@@ -438,12 +438,10 @@ sub format {
       $part =~ s!(</(?:table|ol|ul|center|h[1-6])>)</p>!$1!g;
       # attempts to convert class[name|paragraph] into <p class="name">...
       # tried to use a negative lookahead but it wouldn't work
-      $part =~ s#(<p><span class="([^"<>]+)">(.*?)</span></p>)#
-        my ($one, $two, $three)= ($1, $2, $3); 
-        $3 =~ /<span/ ? $one : qq!<p class="$two">$three</p>!#ge;
-      $part =~ s#(<p><span style="([^"<>]+)">(.*?)</span></p>)#
-        my ($one, $two, $three)= ($1, $2, $3); 
-        $3 =~ /<span/ ? $one : qq!<p style="$two">$three</p>!#ge;
+      $part =~ s#<(p\b[^>]*)><span\ class="([^"<>]+)">(.*?)</span></p>
+               #<$1 class="$2">$3</p>#xg;
+      $part =~ s#<(p\b[^>]*)><span\ style="([^"<>]+)">(.*?)</span></p>
+               #<$1 style="$2">$3</p>#xg;
       if (my $p_class = $self->tag_class('p')) {
        $part =~ s!(<p(?: style="[^"<>]+")?)>!$1 class="$p_class">!g;
       }

diff --git a/t/010-modules/050-format.t b/t/010-modules/050-format.t
index baf3c18ff9ce60f9eb861003daf712f569c56725..d20a0c5bd6779f03401e19bc44982d78ea10a51f 100644 (file)
--- a/t/010-modules/050-format.t
+++ b/t/010-modules/050-format.t
@@ -1,6 +1,6 @@
 #!perl -w
 use strict;
-use Test::More tests => 151;
+use Test::More tests => 153;
 
 sub format_test($$$;$);
 sub noformat_test($$$;$);
@@ -633,6 +633,10 @@ OUT
 <p class="xxx">yy</p>
 <p class="xxx">zz</p>
 EOS
+  format_test "class[xxx|class[yyy|text]]",
+    '<p class="xxx"><span class="yyy">text</span></p>', "more class";
+  format_test "style[font-size: 18px|class[yyy|text]]",
+    '<p style="font-size: 18px"><span class="yyy">text</span></p>', "more class";
   format_test 'div[someclass|h1[|foo]barh2[|quux]]', <<EOS, 'divblock', 'out';
 <div class="someclass">
 <h1>foo</h1>