From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 8 Nov 2006 20:39:48 +0000 (+0000)
Subject: * Patch from Ethan Glasser Camp to add a skip option to the inline plugin.
X-Git-Tag: 1.33~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e1986cf1244d4df3b81bfb8514eb9aa0482a847;p=ikiwiki.git

* Patch from Ethan Glasser Camp to add a skip option to the inline plugin.
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index caef98ef2..ad8b718f3 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -72,6 +72,10 @@ sub preprocess_inline (@) { #{{{
 		return "unknown sort type $params{sort}";
 	}
 
+	if (exists $params{skip}) {
+		@list=@list[$params{skip} .. scalar @list - 1];
+	}
+	
 	if ($params{show} && @list > $params{show}) {
 		@list=@list[0..$params{show} - 1];
 	}
diff --git a/debian/changelog b/debian/changelog
index ee5d81e61..122ea596b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ ikiwiki (1.33) UNRELEASED; urgency=low
     ikiwiki.
   * Enable utf8 file IO in aggregate plugin.
   * Fix some issues with the new registration form.
+  * Patch from Ethan Glasser Camp to add a skip option to the inline plugin.
 
- -- Joey Hess <joeyh@debian.org>  Wed,  8 Nov 2006 15:13:40 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed,  8 Nov 2006 15:39:16 -0500
 
 ikiwiki (1.32) unstable; urgency=low
 
diff --git a/doc/patchqueue/skip_option_for_inline_plugin.mdwn b/doc/patchqueue/skip_option_for_inline_plugin.mdwn
deleted file mode 100644
index 2bb29aebb..000000000
--- a/doc/patchqueue/skip_option_for_inline_plugin.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-This addresses [[todo/skip_option_for_inline_plugin]].
-
-    diff -urx .svn ikiwiki-orig/IkiWiki/Plugin/inline.pm ikiwiki/IkiWiki/Plugin/inline.pm
-    --- ikiwiki-orig/IkiWiki/Plugin/inline.pm   2006-11-08 01:02:33.000000000 -0500
-    +++ ikiwiki/IkiWiki/Plugin/inline.pm        2006-11-08 15:08:04.000000000 -0500
-    @@ -72,6 +72,10 @@
-                return "unknown sort type $params{sort}";
-        }
-
-    +   if (exists $params{skip}) {
-    +           @list=@list[$params{skip} .. scalar @list - 1];
-    +
-    +   }
-        if ($params{show} && @list > $params{show}) {
-                @list=@list[0..$params{show} - 1];
-        }
diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index 807b7f79a..3c3d46d26 100644
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -18,6 +18,8 @@ directive:
 * `show` - Specify the maximum number of matching pages to inline.
   Default is 10, unless archiving, when the default is to show all.
   Set to 0 to show all matching pages.
+* `skip` - Specify a number of pages to skip displaying. Can be useful
+  to produce a feed that only shows archived pages.
 * `rss` - controls generation of an rss feed. On by default if the wiki is
   configured to use rss feeds, set to "no" to disable.
 * `atom` - controls generation of an atom feed. On by default if the wiki is
diff --git a/doc/todo/skip_option_for_inline_plugin.mdwn b/doc/todo/skip_option_for_inline_plugin.mdwn
index 27dea1119..ab310dcd5 100644
--- a/doc/todo/skip_option_for_inline_plugin.mdwn
+++ b/doc/todo/skip_option_for_inline_plugin.mdwn
@@ -3,4 +3,6 @@ How about a skip option for [[plugins/inline]]?  This would allow things like th
     \[[inline pages="news/*" show="5"]]
     \[[inline pages="news/*" skip="5" show="5" archive="yes"]]
 
-> I just wrote a patch. [[patchqueue/skip_option_for_inline_plugin]] --Ethan
\ No newline at end of file
+> I just wrote a patch. [[patchqueue/skip_option_for_inline_plugin]] --Ethan
+
+[[todo/done]] --[[Joey]]