X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0f95adbd1d33e267b9654c80ef2d38ca06407ecb..14b3e645a8e66fe3cc6ff3e7852c7526da4ca906:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 796cf2cf6..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.
@@ -34,6 +36,8 @@ sub getopt () { #{{{
 	GetOptions(
 		"rss!" => \$config{rss},
 		"atom!" => \$config{atom},
+		"allowrss!" => \$config{allowrss},
+		"allowatom!" => \$config{allowatom},
 	);
 }
 
@@ -49,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;
@@ -91,11 +106,10 @@ sub preprocess_inline (@) { #{{{
 	}
 	my $raw=yesno($params{raw});
 	my $archive=yesno($params{archive});
-	my $rss=($config{rss} && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
-	my $atom=($config{atom} && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
+	my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
+	my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom};
 	my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
 	my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
-	$feeds=0 if $params{preview};
 	my $feedonly=yesno($params{feedonly});
 	if (! exists $params{show} && ! $archive) {
 		$params{show}=10;
@@ -152,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="";
 
@@ -182,7 +191,7 @@ sub preprocess_inline (@) { #{{{
 	my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
 	my $ret="";
 
-	if ($config{cgiurl} && (exists $params{rootpage} ||
+	if ($config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
 			(exists $params{postform} && yesno($params{postform})))) {
 		# Add a blog post form, with feed buttons.
 		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
@@ -201,7 +210,7 @@ sub preprocess_inline (@) { #{{{
 		}
 		$ret.=$formtemplate->output;
 	}
-	elsif ($feeds) {
+	elsif ($feeds && !$params{preview}) {
 		# Add feed buttons.
 		my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
 		$linktemplate->param(rssurl => $rssurl) if $rss;
@@ -288,22 +297,29 @@ sub preprocess_inline (@) { #{{{
 		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) {
 			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 (@) { #{{{
@@ -362,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;
 } #}}}