From 4fdfd7a0a6ea679a2bb27ee004ddc4005aaef165 Mon Sep 17 00:00:00 2001
From: Git User <>
Date: Tue, 9 Jul 2024 16:43:22 +0000
Subject: [PATCH] Update rules about graphics state parameter dictionary

---
 .../org/verapdf/pdfa/validation/PDFA-1A.xml   | 26 ++++++++-----------
 .../org/verapdf/pdfa/validation/PDFA-1B.xml   | 26 ++++++++-----------
 .../org/verapdf/pdfa/validation/PDFA-2A.xml   | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-2B.xml   | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-2U.xml   | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-3A.xml   | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-3B.xml   | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-3U.xml   | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-4.xml    | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-4E.xml   | 10 +++----
 .../org/verapdf/pdfa/validation/PDFA-4F.xml   | 10 +++----
 11 files changed, 58 insertions(+), 84 deletions(-)

diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1A.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1A.xml
index d4fb6b7f8..2cca1e0ed 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1A.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1A.xml
@@ -540,7 +540,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.2.8" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -550,12 +550,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.2.8" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
@@ -860,12 +858,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="1"/>
             <description>If an SMask key appears in an ExtGState dictionary, its value shall be None</description>
-            <test>SMask == null || SMask == "None"</test>
+            <test>containsSMask == false || SMaskNameValue == "None"</test>
             <error>
-                <message>An ExtGState contains SMask key with value %1 instead of None</message>
-                <arguments>
-                    <argument>SMask</argument>
-                </arguments>
+                <message>An ExtGState contains SMask key with a value other than None</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
@@ -895,8 +891,8 @@
         </rule>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="4"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: BM - Normal or Compatible</description>
-            <test>BM == null || BM == "Normal" || BM == "Compatible"</test>
+            <description>If a BM key is present in an ExtGState object, its value shall be Normal or Compatible</description>
+            <test>containsBM == false || BMNameValue == "Normal" || BMNameValue == "Compatible"</test>
             <error>
                 <message>An ExtGState dictionary contains the BM key (blend mode) with value %1 that is neither Normal or Compatible</message>
                 <arguments>
@@ -907,7 +903,7 @@
         </rule>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="5"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: CA - 1.0</description>
+            <description>If a CA key is present in an ExtGState object, its value shall be 1.0</description>
             <test>CA == null || CA - 1.0 &lt; 0.000001 &amp;&amp; CA - 1.0 &gt; -0.000001</test>
             <error>
                 <message>An ExtGState dictionary contains the CA key (stroke alpha) with value %1 other than 1.0</message>
@@ -919,7 +915,7 @@
         </rule>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="6"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: ca - 1.0</description>
+            <description>If a ca key is present in an ExtGState object, its value shall be 1.0</description>
             <test>ca == null || ca - 1.0 &lt; 0.000001 &amp;&amp; ca - 1.0 &gt; -0.000001</test>
             <error>
                 <message>An ExtGState dictionary contains the ca key (fill alpha) with value %1 other than 1.0</message>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1B.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1B.xml
index 897ad3930..5d94c754e 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1B.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1B.xml
@@ -540,7 +540,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.2.8" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -550,12 +550,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.2.8" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
@@ -850,12 +848,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="1"/>
             <description>If an SMask key appears in an ExtGState dictionary, its value shall be None</description>
-            <test>SMask == null || SMask == "None"</test>
+            <test>containsSMask == false || SMaskNameValue == "None"</test>
             <error>
-                <message>An ExtGState contains SMask key with value %1 instead of None</message>
-                <arguments>
-                    <argument>SMask</argument>
-                </arguments>
+                <message>An ExtGState contains SMask key with a value other than None</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
@@ -885,8 +881,8 @@
         </rule>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="4"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: BM - Normal or Compatible</description>
-            <test>BM == null || BM == "Normal" || BM == "Compatible"</test>
+            <description>If a BM key is present in an ExtGState object, its value shall be Normal or Compatible</description>
+            <test>containsBM == false || BMNameValue == "Normal" || BMNameValue == "Compatible"</test>
             <error>
                 <message>An ExtGState dictionary contains the BM key (blend mode) with value %1 that is neither Normal or Compatible</message>
                 <arguments>
@@ -897,7 +893,7 @@
         </rule>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="5"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: CA - 1.0</description>
+            <description>If a CA key is present in an ExtGState object, its value shall be 1.0</description>
             <test>CA == null || CA - 1.0 &lt; 0.000001 &amp;&amp; CA - 1.0 &gt; -0.000001</test>
             <error>
                 <message>An ExtGState dictionary contains the CA key (stroke alpha) with value %1 other than 1.0</message>
@@ -909,7 +905,7 @@
         </rule>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="6"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: ca - 1.0</description>
+            <description>If a ca key is present in an ExtGState object, its value shall be 1.0</description>
             <test>ca == null || ca - 1.0 &lt; 0.000001 &amp;&amp; ca - 1.0 &gt; -0.000001</test>
             <error>
                 <message>An ExtGState dictionary contains the ca key (fill alpha) with value %1 other than 1.0</message>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2A.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2A.xml
index ec9536996..465d5b7e2 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2A.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2A.xml
@@ -486,7 +486,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -496,12 +496,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2B.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2B.xml
index bdf6aa629..5b2f1c52a 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2B.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2B.xml
@@ -486,7 +486,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -496,12 +496,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2U.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2U.xml
index 1297e0309..f302ebd3c 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2U.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2U.xml
@@ -486,7 +486,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -496,12 +496,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3A.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3A.xml
index e4e3be240..385a6b86b 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3A.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3A.xml
@@ -486,7 +486,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_3" clause="6.2.5" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -496,12 +496,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_3" clause="6.2.5" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3B.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3B.xml
index bac86a9ed..2f0f818a1 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3B.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3B.xml
@@ -486,7 +486,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_3" clause="6.2.5" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -496,12 +496,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_3" clause="6.2.5" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3U.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3U.xml
index 58708227b..a881f91d8 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3U.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3U.xml
@@ -486,7 +486,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_3" clause="6.2.5" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
@@ -496,12 +496,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_3" clause="6.2.5" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4.xml
index 3c7abe4c1..87f681be2 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4.xml
@@ -402,7 +402,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="1"/>
             <description>A graphics state parameter dictionary (ISO 32000-2:2020, 8.4.5) shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>A graphics state parameter dictionary contains the TR key</message>
                 <arguments/>
@@ -414,12 +414,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="2"/>
             <description>A graphics state parameter dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>A graphics state parameter dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>A graphics state parameter dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4E.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4E.xml
index 411f7fd19..179dee87c 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4E.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4E.xml
@@ -416,7 +416,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="1"/>
             <description>A graphics state parameter dictionary (ISO 32000-2:2020, 8.4.5) shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>A graphics state parameter dictionary contains the TR key</message>
                 <arguments/>
@@ -428,12 +428,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="2"/>
             <description>A graphics state parameter dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>A graphics state parameter dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>A graphics state parameter dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4F.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4F.xml
index b40fba902..8d9581291 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4F.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4F.xml
@@ -402,7 +402,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="1"/>
             <description>A graphics state parameter dictionary (ISO 32000-2:2020, 8.4.5) shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>A graphics state parameter dictionary contains the TR key</message>
                 <arguments/>
@@ -414,12 +414,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="2"/>
             <description>A graphics state parameter dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == "Default"</test>
+            <test>containsTR2 == false || TR2NameValue == "Default"</test>
             <error>
-                <message>A graphics state parameter dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>A graphics state parameter dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>