diff options
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 15 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 15 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index c7107d664..0002371c1 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -10,6 +10,7 @@ use URI; my %knownfeeds; my %page_numfeeds; +my @inline; sub import { #{{{ hook(type => "getopt", id => "inline", call => \&getopt); @@ -19,6 +20,7 @@ sub import { #{{{ call => \&IkiWiki::preprocess_inline); hook(type => "pagetemplate", id => "inline", call => \&IkiWiki::pagetemplate_inline); + hook(type => "format", id => "inline", call => \&format); # Hook to change to do pinging since it's called late. # This ensures each page only pings once and prevents slow # pings interrupting page builds. @@ -51,6 +53,15 @@ sub checkconfig () { #{{{ } } #}}} +sub format (@) { #{{{ + my %params=@_; + + # Fill in the inline content generated earlier. This is actually an + # optimisation. + $params{content}=~s!<div class="inline" id="([^"]+)"></div>!$inline[$1]!g; + return $params{content}; +} #}}} + sub sessioncgi () { #{{{ my $q=shift; my $session=shift; @@ -304,7 +315,9 @@ sub preprocess_inline (@) { #{{{ } } - return $ret; + return $ret if $raw; + push @inline, $ret; + return "<div class=\"inline\" id=\"$#inline\"></div>\n\n"; } #}}} sub pagetemplate_inline (@) { #{{{ diff --git a/debian/changelog b/debian/changelog index 81a5d4a1d..c92cf86ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low (Old files will be automatically converted.) * Close meta tag for redir properly. * smiley: Detect smileys inside pre and code tags, and do not expand. + * inline: Crazy optimisation to work around slow markdown. -- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100 |