Update property types to Set/List of String

veraPDF · May 15, 2024 · ca9bd6e · ca9bd6e
1 parent a4eca1b
commit ca9bd6e
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 93 deletions.
diff --git a/PDF_UA/PDFUA-1.xml b/PDF_UA/PDFUA-1.xml
@@ -79,7 +79,7 @@
         <rule object="SEMarkedContent" tags="artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="2"/>
             <description>Tagged content should not present inside content marked as Artifact</description>
-            <test>isTaggedContent == false || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length == 0</test>
+            <test>isTaggedContent == false || parentsTags.contains('Artifact') == false</test>
             <error>
                 <message>Tagged content (parent struct element %1) is present inside content marked as Artifact</message>
                 <arguments>
@@ -91,7 +91,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="3"/>
             <description>Content shall be marked as Artifact or tagged as real content</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>

diff --git a/PDF_UA/PDFUA-2-ISO32005.xml b/PDF_UA/PDFUA-2-ISO32005.xml
@@ -91,7 +91,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="ISO_14289_2" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>

diff --git a/PDF_UA/PDFUA-2.xml b/PDF_UA/PDFUA-2.xml
@@ -91,7 +91,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="ISO_14289_2" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>

diff --git a/PDF_UA/WCAG-2-2-Complete.xml b/PDF_UA/WCAG-2-2-Complete.xml
diff --git a/PDF_UA/WCAG-2-2-Machine.xml b/PDF_UA/WCAG-2-2-Machine.xml
@@ -21,7 +21,7 @@
         <rule object="SEMarkedContent" tags="major,machine,artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="2"/>
             <description>Tagged content should not present inside content marked as Artifact</description>
-            <test>(isTaggedContent == false || isArtifact == true) || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length == 0</test>
+            <test>(isTaggedContent == false || isArtifact == true) || parentsTags.contains('Artifact') == false</test>
             <error>
                 <message>Tagged content (parent struct element %1) is present inside content marked as Artifact</message>
                 <arguments>
@@ -33,7 +33,7 @@
         <rule object="SESimpleContentItem" tags="critical,machine,artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="3"/>
             <description>Content shall be marked as Artifact or tagged as real content</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>
@@ -1420,7 +1420,7 @@
         <rule object="SATOCI" tags="minor,machine,structure,toc">
             <id specification="WCAG_2_2" clause="4.1.2" testNumber="29"/>
             <description>TOCI shall contain one or more text lines</description>
-            <test>errorCodes.split(',').filter(elem =&gt; elem == 1000).length == 0</test>
+            <test>errorCodes.contains('1000') == false</test>
             <error>
                 <message>TOCI doesn't have a text</message>
                 <arguments>

diff --git a/PDF_UA/WCAG-2-2.xml b/PDF_UA/WCAG-2-2.xml
diff --git a/PDF_UA/WTPDF-1-0-Accessibility.xml b/PDF_UA/WTPDF-1-0-Accessibility.xml
@@ -9,7 +9,7 @@
         <rule object="MainXMPPackage" tags="metadata">
             <id specification="WTPDF_1_0" clause="6.1.3" testNumber="1"/>
             <description>File conforming to the WTPDF 1.0 conformance level for accessibility shall include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#accessibility1.0" as its pdfd:conformsTo entry</description>
-            <test>declarations.split(',').filter(declarations =&gt; declarations == 'http://pdfa.org/declarations/wtpdf#accessibility1.0').length == 1</test>
+            <test>declarations.contains('http://pdfa.org/declarations/wtpdf#accessibility1.0') == true</test>
             <error>
                 <message>File conforming to the WTPDF 1.0 conformance level for accessibility doesn't include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#accessibility1.0" as its pdfd:conformsTo entry</message>
                 <arguments/>
@@ -43,7 +43,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="WTPDF_1_0" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>

diff --git a/PDF_UA/WTPDF-1-0-Reuse.xml b/PDF_UA/WTPDF-1-0-Reuse.xml
@@ -9,7 +9,7 @@
         <rule object="MainXMPPackage" tags="metadata">
             <id specification="WTPDF_1_0" clause="6.1.2" testNumber="1"/>
             <description>File conforming to the WTPDF 1.0 conformance level for reuse shall include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#reuse1.0" as its pdfd:conformsTo entry</description>
-            <test>declarations.split(',').filter(declarations =&gt; declarations == 'http://pdfa.org/declarations/wtpdf#reuse1.0').length == 1</test>
+            <test>declarations.contains('http://pdfa.org/declarations/wtpdf#reuse1.0') == true</test>
             <error>
                 <message>File conforming to the WTPDF 1.0 conformance level for reuse doesn't include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#reuse1.0" as its pdfd:conformsTo entry</message>
                 <arguments/>
@@ -43,7 +43,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="WTPDF_1_0" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>