Merge branch 'fix/pdfa-xmp-value-types' into fix/pdfa-xmp-exif-types

crates/preflight/src/tests.rs

@@ -774,6 +774,11 @@ fn xmp_value_forms_are_those_xmp_allows() {
         mistyped(r#"><crs:Contrast rdf:parseType="Resource"><rdf:value>5</rdf:value><rdf:value>five</rdf:value></crs:Contrast>"#),
         ["crs:Contrast"]
     );
+    assert_eq!(
+        mistyped(r#"><crs:Contrast><rdf:Description rdf:value="five"><rdf:value>5</rdf:value></rdf:Description></crs:Contrast>"#),
+        ["crs:Contrast"]
+    );
+    assert!(mistyped(r#"><crs:Contrast><rdf:Description><rdf:value>5</rdf:value></rdf:Description></crs:Contrast>"#).is_empty());
     // Only parseType="Resource" has a place in XMP; an rdf:resource element holds no element.
     assert_eq!(mistyped(r#"><crs:Contrast rdf:parseType="Literal">5</crs:Contrast>"#), ["crs:Contrast"]);
     assert_eq!(mistyped(r#"><xmpMM:DerivedFrom rdf:parseType="Literal" stRef:documentID="d"/>"#), ["xmpMM:DerivedFrom"]);

crates/preflight/src/xmp_types.rs

@@ -688,10 +688,10 @@ fn fits(ty: Ty, e: &Node<'_, '_>, depth: usize) -> bool {
     // predefined properties keep their types too.
     let node = if resource { Some(*e) } else { description };
     if let Some(n) = node {
-        // A qualified value has one `rdf:value`.
+        // A qualified value has one `rdf:value`: an element, or an attribute in its place.
         match n.children().filter(|c| is(c, RDF, "value")).collect::<Vec<_>>().as_slice() {
             [] => {}
-            [v] => return blank(e) && blank(&n) && fits(ty, v, deeper) && predefined_ok(&n, deeper),
+            [v] => return n.attribute((RDF, "value")).is_none() && blank(e) && blank(&n) && fits(ty, v, deeper) && predefined_ok(&n, deeper),
             _ => return false,
         }
     }