smiley: Detect smileys inside pre and tags, and do not expand.

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 932c2c4fe928f88e8a140482144290b36c2016bb..7e0b54499d1edb70a57d42a959e56b0ed513f26f 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -34,13 +34,47 @@ sub build_regexp () { #{{{
 
 sub filter (@) { #{{{
        my %params=@_;
 
 sub filter (@) { #{{{
        my %params=@_;

-       
+

        build_regexp() unless defined $smiley_regexp;
        build_regexp() unless defined $smiley_regexp;

-       $params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{
-               $1 ? $2 : htmllink($params{page}, $params{destpage}, $smileys{$2}, linktext => $2)
-       }egs if length $smiley_regexp;
+       
+       $_=$params{content};
+       return $_ unless length $smiley_regexp;
+       
+MATCH: while (m{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}g) {
+               # Smilies are not allowed inside <pre> or <code>.
+               # For each tag in turn, match forward to find <tag> or
+               # </tag>. If it's </tag>, then the smiley is inside the
+               # tag, and is not expanded. If it's <tag>, the smiley is
+               # outside the block.
+               my $pos=pos;
+               foreach my $tag ("pre", "code") {
+                       if (m/.*?<(\/)?\s*$tag\s*>/isg) {
+                               if (defined $1) {
+                                       # Inside tag, so do nothing.
+                                       # (Smiley hunting will continue after
+                                       # the tag.)
+                                       next MATCH;
+                               }
+                               else {
+                                       # Reset pos back to where it was before
+                                       # this test.
+                                       pos=$pos;
+                               }
+                       }
+               }
+
+               if ($1) {
+                       # Remove escape.
+                       substr($_, $-[1], 1)="";
+               }
+               else {
+                       # Replace the smiley with its expanded value.
+                       substr($_, $-[2], length($2))=
+                               htmllink($params{page}, $params{destpage}, $smileys{$2}, linktext => $2);
+               }
+       }

 
 

-       return $params{content};
+       return $_;

 } # }}}
 
 1
 } # }}}
 
 1

diff --git a/debian/changelog b/debian/changelog
index ef16cbfaf8c240e01e1158af9b08b185376cdda0..761b89471141c8e8b02559b6cbc6037c9d8087b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low
   * Store userinfo in network byte order for easy portability.
     (Old files will be automatically converted.)
   * Close meta tag for redir properly.
   * Store userinfo in network byte order for easy portability.
     (Old files will be automatically converted.)
   * Close meta tag for redir properly.

+  * smiley: Detect smileys inside pre and tags, and do not expand.

 
  -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100
 
 
  -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100
 

diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
index fe536676071fce26f3d5d0a61322daa80d219261..f283bfa65fa7fcf7776156398cdf734058f03368 100644 (file)
--- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
+++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
@@ -13,7 +13,7 @@ plugin which end up wrapped in a `<pre>` tag in the inline diff output.
 `<img>` tags is not allowed within a `<pre>` block.  Maybe the smiley
 plugin should be disabled on [[RecentChanges]]?
 
 `<img>` tags is not allowed within a `<pre>` block.  Maybe the smiley
 plugin should be disabled on [[RecentChanges]]?
 

-> See [[Smileys_in_the_block_code]] --[[Joey]]
+> See [[Smileys_in_the_block_code]], which is now fixed. --[[Joey]]

 
 See the [validator output][validate] for more details.
 
 
 See the [validator output][validate] for more details.
 


@@ -51,4 +51,6 @@ after installing the most recent version of Text::Markdown from CPAN.
 Note that the above patch for the redirect tag is still applicable and
 the smiley issue remains open. --[[JasonBlevins]]
 
 Note that the above patch for the redirect tag is still applicable and
 the smiley issue remains open. --[[JasonBlevins]]
 

+> This bug is [[done]], all issues are fixed. --[[Joey]]
+

 [[tag patch]]
 [[tag patch]]

diff --git a/doc/bugs/Smileys_in_the_block_code.mdwn b/doc/bugs/Smileys_in_the_block_code.mdwn
index 08ff90789067b68436371cbf273fa7600633adbb..b7854705b81c838062d045878aef44efd66c42d3 100644 (file)
--- a/doc/bugs/Smileys_in_the_block_code.mdwn
+++ b/doc/bugs/Smileys_in_the_block_code.mdwn
@@ -29,3 +29,6 @@ BTW, maybe converting smileys in the block code should be disabled at all?
 > Looks similar to [[wiki_links_still_processed_inside_code_blocks]]; in both
 > cases, substitution happens in a code block, which it shouldn't.
 > --[[JoshTriplett]]
 > Looks similar to [[wiki_links_still_processed_inside_code_blocks]]; in both
 > cases, substitution happens in a code block, which it shouldn't.
 > --[[JoshTriplett]]

+
+> [[fixed|done]], via some super duper regexp fun to notice if the smiley
+> is inside a pre or code tag. --[[Joey]]

diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
index 744f26f4cab2d6c7f9348b1794f8b45a75b39d18..c4e4ba6ef83ddae50ddb6931051cfb8dc964a5b9 100644 (file)
--- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
+++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
@@ -41,3 +41,7 @@ and have it render like:
 > 
 > In the case of either bug, no, I don't have an idea of a solution yet.
 > --[[Joey]]
 > 
 > In the case of either bug, no, I don't have an idea of a solution yet.
 > --[[Joey]]

+
+> I've now solved a similar bug involving the smiley plugin. The code used
+> there should give some strong hints how to fix this bug, though I haven't
+> tried to apply the method yet. --[[Joey]]