Improve some coercements

Author: dwarring

lib/PDF/AcroForm.rakumod

@@ -78,13 +78,22 @@ has Str $.DA is entry(:alias<default-appearance>);                    # (Optiona
 has UInt $.Q is entry(:alias<quadding>);                              # (Optional) A document-wide default value for the Q attribute of variable text fields
 
 my subset XFA where .[0] ~~ TextOrStream;
-multi sub coerce-xfa-elem(TextOrStream $v) { $v }
-multi sub coerce-xfa-elem($v is rw) {
-    coerce-text-or-stream($v, TextOrStream);
+multi sub coerce-xfa-elem(PDF::COS::TextString $v, $ where $_ %% 2) {
+    $v;
 }
+multi sub coerce-xfa-elem($v is rw, $ where $_ %% 2) {
+    $v = PDF::COS::TextString.COERCE: $v;
+}
+multi sub coerce-xfa-elem(PDF::COS::Stream $s, $ where $_ !%% 2) {
+    $s
+}
+multi sub coerce-xfa-elem($e, $_) {
+    fail "Unable to coerece XFA element of type {$e.WHAT.raku} at index $_";
+}
+
 multi sub coerce-xfa(List $a, XFA) {
-   coerce-xfa-elem( $a[$_])
-        for 0, 2 ... +$a;
+   coerce-xfa-elem( $a[$_], $_)
+        for ^+$a;
 }
 multi sub coerce-xfa($_, $) { warn "unable to coerce to XFA forms: {.raku}" }
 has XFA $.XFA is entry(:coerce(&coerce-xfa));          # (Optional; PDF 1.5) A stream or array containing an XFA resource, whose format is described by the Data Package (XDP) Specification.

lib/PDF/Annot.rakumod

@@ -17,9 +17,7 @@ use PDF::Class::Defs :BlendMode;
 use PDF::Appearance;
 use PDF::Border;
 use PDF::Filespec;
-use PDF::OCG;   # optional content group
-use PDF::OCMD;  # optional content membership dict
-my subset OCG-or-OCMD where PDF::OCG|PDF::OCMD;
+use PDF::Class::OptionalContent;
 use PDF::Page;
 
 use ISO_32000::Table_164-Entries_common_to_all_annotation_dictionaries;
@@ -69,7 +67,7 @@ role Border does PDF::COS::Tie::Array {
 has Border $.Border is entry(:default[0, 0, 1]);            # (Optional) An array specifying the characteristics of the annotation’s border. The border is specified as a rounded rectangle.
 has Numeric @.C is entry(:alias<color>);                    # (Optional; PDF 1.1) An array of numbers in the range 0.0 to 1.0, representing a color used for (*) background, when closed, (*) title bar of pop-up window, (*) link border
 has UInt $.StructParent is entry(:alias<struct-parent>);                           # (Required if the annotation is a structural content item; PDF 1.3) The integer key of the annotation’s entry in the structural parent tree
-has OCG-or-OCMD $.OC is entry(:alias<optional-content>);    # (Optional; PDF 1.5) An optional content group or optional content membership dictionary specifying the optional content properties for the annotation.
+has  PDF::Class::OptionalContent $.OC is entry(:alias<optional-content>);    # (Optional; PDF 1.5) An optional content group or optional content membership dictionary specifying the optional content properties for the annotation.
 
 has PDF::Filespec @.AF is entry(); # (Optional; PDF 2.0) An array of one or more file specification dictionaries, which denote the associated files for this annotation).
 

lib/PDF/Appearance.rakumod

@@ -24,7 +24,7 @@ my role AppearanceStates
 
 my subset AppearEntry where FormLike | AppearanceStates;
 multi sub coerce(PDF::COS::Stream $dict is rw, AppearEntry) {
-    warn "Stream not of /Subtype /Form"
+    fail "Stream not of /Subtype /Form"
 }
 multi sub coerce(Hash $dict is rw, AppearEntry) {
     AppearanceStates.COERCE: $dict;