Add path and path_natural sort orders

(cherry picked from commit 272e0b2f17c33c625b494b07f581da400066a216)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 59fefc69933e49768e6c36d2b389f61d0fc68b6a..08e242a1f07de9e40bda8e91c521c69b9b7be0ba 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2808,6 +2808,7 @@ sub cmp_title {
        IkiWiki::pagetitle(IkiWiki::basename($b))
 }
 
        IkiWiki::pagetitle(IkiWiki::basename($b))
 }
 

+sub cmp_path { IkiWiki::pagetitle($a) cmp IkiWiki::pagetitle($b) }

 sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} }
 sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} }
 
 sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} }
 sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} }
 

diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
index b038b2f9a662358c015806bd22a7159c51b922c6..108b489f80d6f7e71916c891345ecea8569e9ed3 100644 (file)
--- a/IkiWiki/Plugin/sortnaturally.pm
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -30,4 +30,9 @@ sub cmp_title_natural {
                IkiWiki::pagetitle(IkiWiki::basename($b)))
 }
 
                IkiWiki::pagetitle(IkiWiki::basename($b)))
 }
 

+sub cmp_path_natural {
+       Sort::Naturally::ncmp(IkiWiki::pagetitle($a),
+               IkiWiki::pagetitle($b))
+}
+

 1;
 1;

diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index ccd7f7eaa84dc773a57003d2e38d332cc97e1a05..0c6cc74c7a7fdc808749c666625264598bba7a2a 100644 (file)
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -7,10 +7,14 @@ orders can be specified.
 
 * `mtime` - List pages with the most recently modified first.
 
 
 * `mtime` - List pages with the most recently modified first.
 

-* `title` - Order by title (page name).
+* `title` - Order by title (page name), e.g. "z/a a/b a/c"
+
+* `path` - Order by page name including parents, e.g. "a/b a/c z/a"

 [[!if test="enabled(sortnaturally)" then="""
 * `title_natural` - Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 [[!if test="enabled(sortnaturally)" then="""
 * `title_natural` - Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")

+
+* `path_natural` - Like `path`, but numbers in the title are treated as such

 """]]
 [[!if test="enabled(meta)" then="""
 * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
 """]]
 [[!if test="enabled(meta)" then="""
 * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`