Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d58c655c53559ffece5b8e4f09a4fcf45efe1ede..9b2caffcfe690ec6788d409840766bcde0cdb038 100644 (file)
--- 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,17 @@ 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>}{
+               delete @inline[$1,]
+       }eg;
+       return $params{content};
+} #}}}
+
 sub sessioncgi () { #{{{
        my $q=shift;
        my $session=shift;
@@ -153,11 +166,6 @@ sub preprocess_inline (@) { #{{{
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        add_depends($params{page}, join(" or ", @list));
-       # Force a scan of this page so any metadata that appears after this
-       # inline directive is available when inlining. The page normally 
-       # wouldn't be scanned if it's only being rebuilt because of a
-       # depedency.
-       IkiWiki::scan($pagesources{$params{page}});
 
        my $feednum="";
 
@@ -286,25 +294,32 @@ sub preprocess_inline (@) { #{{{
                        @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
                }
        
-               if ($rss && ! $params{preview}) {
+               if ($rss) {
                        my $rssp=rsspage($params{destpage}).$feednum;
                        will_render($params{destpage}, $rssp);
-                       writefile($rssp, $config{destdir},
-                               genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
-                       $toping{$params{destpage}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                       if (! $params{preview}) {
+                               writefile($rssp, $config{destdir},
+                                       genfeed("rss",
+                                               $config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
+                               $toping{$params{destpage}}=1 unless $config{rebuild};
+                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                       }
                }
-               if ($atom && ! $params{preview}) {
+               if ($atom) {
                        my $atomp=atompage($params{destpage}).$feednum;
                        will_render($params{destpage}, $atomp);
-                       writefile($atomp, $config{destdir},
-                               genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
-                       $toping{$params{destpage}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                       if (! $params{preview}) {
+                               writefile($atomp, $config{destdir},
+                                       genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
+                               $toping{$params{destpage}}=1 unless $config{rebuild};
+                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                       }
                }
        }
        
-       return $ret;
+       return $ret if $raw;
+       push @inline, $ret;
+       return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
 } #}}}
 
 sub pagetemplate_inline (@) { #{{{
@@ -363,8 +378,8 @@ sub absolute_urls ($$) { #{{{
        $url=~s/[^\/]+$//;
        
        $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
-       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/mig;
-       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/mig;
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)([^"]+)"/$1 href="$url$2"/mig;
+       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)([^"]+)"/$1 src="$url$2"/mig;
        return $content;
 } #}}}