X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f64ef7deb643f9bc4bb911cd858db96c2f528f87..e8ff29fa330aef5e8d30eeef44218b87c4a9d97e:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index b40303078..9b2caffcf 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,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="";
 
@@ -291,7 +299,8 @@ sub preprocess_inline (@) { #{{{
 			will_render($params{destpage}, $rssp);
 			if (! $params{preview}) {
 				writefile($rssp, $config{destdir},
-					genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
+					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" />};
 			}
@@ -301,14 +310,16 @@ sub preprocess_inline (@) { #{{{
 			will_render($params{destpage}, $atomp);
 			if (! $params{preview}) {
 				writefile($atomp, $config{destdir},
-					genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
+					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 (@) { #{{{
@@ -367,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;
 } #}}}