Merge commit 'origin/master' into po

[git.ikiwiki.info.git] / doc / todo / pagespec_relative_to_a_target.mdwn

diff --git a/doc/todo/pagespec_relative_to_a_target.mdwn b/doc/todo/pagespec_relative_to_a_target.mdwn
index 62bb3ea29ec08ebb50fff308609096ecd97ff44e..4757988e0a27b0b7cdcb8fa23978f151cc1bbad4 100644 (file)
--- a/doc/todo/pagespec_relative_to_a_target.mdwn
+++ b/doc/todo/pagespec_relative_to_a_target.mdwn
@@ -57,7 +57,7 @@ diff -urNX ignorepats ikiwiki/IkiWiki/Plugin/relative.pm ikidev/IkiWiki/Plugin/r
 +
 +package IkiWiki::PageSpec;
 +
 +
 +package IkiWiki::PageSpec;
 +

-+sub match_relative($$;@) { #{{{
++sub match_relative($$;@) {

 +      my $parent = shift;
 +      my $spec = shift;
 +      my %params = @_;
 +      my $parent = shift;
 +      my $spec = shift;
 +      my %params = @_;


@@ -69,26 +69,26 @@ diff -urNX ignorepats ikiwiki/IkiWiki/Plugin/relative.pm ikidev/IkiWiki/Plugin/r
 +              }
 +      }
 +      return IkiWiki::FailReason->new("$parent can't match $spec against anything");
 +              }
 +      }
 +      return IkiWiki::FailReason->new("$parent can't match $spec against anything");

-+} #}}}
++}

 +
 +

-+sub match_has_child($$;@) { #{{{
++sub match_has_child($$;@) {

 +      my $page = shift;
 +      my $childname = shift;
 +      my $spec;
 +      my $page = shift;
 +      my $childname = shift;
 +      my $spec;

-+      if ($childname) { #{{{
++      if ($childname) {

 +              $spec = "$page/$childname or $page/*/$childname";
 +              $spec = "$page/$childname or $page/*/$childname";

-+      } #}}}
-+      else { #{{{
++      }
++      else {

 +              $spec = "$page/*";
 +              $spec = "$page/*";

-+      } #}}}
++      }

 +
 +      return match_relative($page, $spec, @_);
 +
 +      return match_relative($page, $spec, @_);

-+} #}}}
++}

 +
 +1
 </pre>
 
 +
 +1
 </pre>
 

-[[tag patch]]
+[[!tag patch]]

 
 > This looks really interesting.  It reminds me of XPath and its conditionals.
 > Those might actually work well adapted to pagespecs.  For instance, to write
 
 > This looks really interesting.  It reminds me of XPath and its conditionals.
 > Those might actually work well adapted to pagespecs.  For instance, to write