Refactor ancestor-or-self and descendant-or-self axes

README.md

@@ -65,7 +65,7 @@ PDF tagging may assist PDF readers and other automated tools in reading PDF
 documents and locating content such as text and images.
 
 This module provides a DOM  like interface for creating and traversing PDF structure and
-content via tags. It also an XPath like search capability. It is designed for use in
+content via tags. It also has an XPath like search capability. It is designed for use in
 conjunction with PDF::Class or PDF::API6.
 
 Standard Tags
@@ -344,7 +344,7 @@ $page.graphics: -> $gfx {
 
 ### Content Continuation
 
-Content sometimes needs to be continued across graphics objects, such as a paragraph that
+Content sometimes needs to be continued across graphics elements, such as a paragraph that
 spans multiple pages. The `mark` method may be called repeatably to achieve this:
 
 ```raku

examples/link.raku

@@ -39,7 +39,7 @@ $page.graphics: -> $gfx {
 
     # Use PDF::API6 to create the link
     my $link-text ='Sample Annot';
-    my $destination = $pdf.destination( :name<sample-annot>, :page(2), :fit(FitWindow) );
+    my DestRef $destination = $pdf.destination( :name<sample-annot>, :page(2), :fit(FitWindow) );
     my PDF::Action $action = PDF::API6.action: :$destination;
     my PDF::Annot::Link $href = $pdf.annotation: :$page, :$action, :content($link-text), :Border[0,0,0], :rect[0 xx 4];
 

lib/PDF/Tags/XPath/Axes.rakumod

@@ -6,22 +6,17 @@ use PDF::Tags::Node;
 sub child(PDF::Tags::Node:D $_) is export { .?kids // [] }
 
 sub ancestor-or-self(PDF::Tags::Node:D $_) is export {
-    my @nodes = ancestor-or-self($_)
-        with .?parent;
-    @nodes.push: $_;
+    ancestor($_).push: $_;
  }
 
 sub ancestor(PDF::Tags::Node:D $_) is export {
     my @nodes = ancestor-or-self($_)
         with .?parent;
-    @nodes;
+    @nodes
 }
 
 sub descendant-or-self(PDF::Tags::Node:D $_) is export {
-    my @nodes = $_;
-    @nodes.append: descendant-or-self($_)
-        for .?kids // [];
-    @nodes;
+    descendant($_).unshift: $_;
 }
 
 sub descendant(PDF::Tags::Node:D $_) is export {
@@ -82,7 +77,7 @@ sub preceding-sibling(PDF::Tags::Node:D $item) is export {
 }
 
 sub parent(PDF::Tags::Node:D $_) is export {
-    with .?parent { [ $_ ] } else { [] }
+    .?parent // [];
 }
 
 sub self(PDF::Tags::Node:D $_) is export {