Tweak current-point() method #26

pdf-raku · Dec 8, 2024 · 8a7cfe9 · 8a7cfe9
1 parent c16aa22
commit 8a7cfe9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/docs/PDF/Content/Ops.md b/docs/PDF/Content/Ops.md
@@ -87,12 +87,12 @@ return all current graphics state variables
 ### method current-point
 
 ```raku
-method current-point() returns PDF::Content::Ops::Vector
+method current-point() returns List
 ```
 
 return current point
 
-This method is only valid in a path context
+This method returns the x,y position of current point in a path context, or an empty list otherwise
 
 ### multi method op
 

diff --git a/lib/PDF/Content/Ops.rakumod b/lib/PDF/Content/Ops.rakumod
@@ -881,11 +881,11 @@ method is-graphics-op($op-name) {
 
 my subset Vector of List is export(:Vector) where {.elems == 2 && .&are ~~ Numeric}
 #| return current point
-method current-point is rw returns Vector {
+method current-point is rw returns List {
     sub FETCH($) {
         $!context == Path
             ?? ($!cur-x, $!cur-y)
-            !! (Numeric, Numeric)
+            !! ()
     }
     sub STORE($,  Vector \v) {
         unless $!context == Path && $!cur-x =~= v[0] && $!cur-x =~= v[1] {
@@ -894,7 +894,7 @@ method current-point is rw returns Vector {
     }
     Proxy.new: :&FETCH, :&STORE;
 }
-=para This method is only valid in a path context
+=para This method returns the x,y position of current point in a path context, or an empty list otherwise
 
 #| process operator quarantined by PDF::Grammar::Content / PDF::Native::COS as either an
 #| unknown operator or having an incorrect argument list

diff --git a/t/current-point.t b/t/current-point.t
@@ -1,6 +1,6 @@
 use Test;
 use PDF::Grammar::Test :&is-json-equiv;
-plan 8;
+plan 10;
 
 use lib 't';
 use PDFTiny;
@@ -26,9 +26,11 @@ given $pdf.add-page.gfx {
 
     .ClosePath;
     is-deeply .current-point, (40, 42);
+    ok .current-point;
 
     .Stroke;
-    is-deeply .current-point, (Numeric, Numeric);
+    is-deeply .current-point, List;
+    nok .current-point;
 }
 
 done-testing;