From 4013628e0c4c44e336f90a7da0f4ee371f77da88 Mon Sep 17 00:00:00 2001
From: georgetarazevich <georgetarazevich@users.noreply.github.com>
Date: Thu, 23 Nov 2023 10:31:17 +0300
Subject: [PATCH] Update policy files according to new rules

---
 PDF_A-1b/1010/FontMatrix-1.sch   | 12 +++--
 PDF_A-1b/1010/felltypes-test.sch | 28 ++++++-----
 PDF_A-1b/1117/FULLTEXT01.sch     | 28 ++++++-----
 PDF_A-1b/1200/m1-1-F.sch         | 19 ++++++--
 PDF_A-1b/737/thesis.test.sch     | 82 +++++++++++++++-----------------
 5 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/PDF_A-1b/1010/FontMatrix-1.sch b/PDF_A-1b/1010/FontMatrix-1.sch
index 5769449..ba22b8c 100755
--- a/PDF_A-1b/1010/FontMatrix-1.sch
+++ b/PDF_A-1b/1010/FontMatrix-1.sch
@@ -16,19 +16,21 @@
 
     <sch:pattern name = "Checking the validationReport: rules">
         <sch:rule context="/report/jobs/job/validationReport/details">
-            <sch:assert test="(@failedRules = '5')">Failed check, Expected: 5</sch:assert>	
+            <sch:assert test="(@failedRules = '6')">Failed check, Expected: 6</sch:assert>	
         </sch:rule>
 
         <sch:rule context="/report/jobs/job/validationReport/details/rule">
-            <sch:assert test="(@clause = '6.7.9' and @testNumber = '2' and @failedChecks = '4') or 
+            <sch:assert test="(@clause = '6.1.4' and @testNumber = '3' and @failedChecks = '1') or 
             (@clause = '6.2.3.3' and @testNumber = '3' and @failedChecks = '2') or 
-            (@clause = '6.7.9' and @testNumber = '3' and @failedChecks = '4') or 
             (@clause = '6.3.2' and @testNumber = '7' and @failedChecks = '1') or 
+            (@clause = '6.7.9' and @testNumber = '2' and @failedChecks = '4') or 
+            (@clause = '6.7.9' and @testNumber = '3' and @failedChecks = '4') or 
             (@clause = '6.7.11' and @testNumber = '1' and @failedChecks = '1')">Failed rules, Expected: 
-            6.7.9-2, 4 checks, or 
+            6.1.4-3, 1 check, or 
             6.2.3.3-3, 2 checks, or 
-            6.7.9-3, 4 checks, or 
             6.3.2-7, 1 check, or 
+            6.7.9-2, 4 checks, or 
+            6.7.9-3, 4 checks, or 
             6.7.11-1, 1 check</sch:assert>
         </sch:rule>
 
diff --git a/PDF_A-1b/1010/felltypes-test.sch b/PDF_A-1b/1010/felltypes-test.sch
index 419962d..379a1a1 100755
--- a/PDF_A-1b/1010/felltypes-test.sch
+++ b/PDF_A-1b/1010/felltypes-test.sch
@@ -16,30 +16,32 @@
 
     <sch:pattern name = "Checking the validationReport: rules">
         <sch:rule context="/report/jobs/job/validationReport/details">
-            <sch:assert test="(@failedRules = '10')">Failed check, Expected: 10</sch:assert>	
+            <sch:assert test="(@failedRules = '11')">Failed check, Expected: 11</sch:assert>	
         </sch:rule>
 
         <sch:rule context="/report/jobs/job/validationReport/details/rule">
-            <sch:assert test="(@clause = '6.7.3' and @testNumber = '7' and @failedChecks = '1') or 
-            (@clause = '6.7.3' and @testNumber = '3' and @failedChecks = '1') or 
-            (@clause = '6.7.3' and @testNumber = '5' and @failedChecks = '1') or 
+            <sch:assert test="(@clause = '6.1.4' and @testNumber = '3' and @failedChecks = '1') or 
             (@clause = '6.1.8' and @testNumber = '1' and @failedChecks = '11') or 
-            (@clause = '6.3.5' and @testNumber = '3' and @failedChecks = '4') or 
             (@clause = '6.2.3.3' and @testNumber = '3' and @failedChecks = '12') or 
-            (@clause = '6.7.3' and @testNumber = '2' and @failedChecks = '1') or 
+            (@clause = '6.3.5' and @testNumber = '3' and @failedChecks = '4') or 
             (@clause = '6.7.2' and @testNumber = '1' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '2' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '3' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '4' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '5' and @failedChecks = '1') or 
             (@clause = '6.7.3' and @testNumber = '6' and @failedChecks = '1') or 
-            (@clause = '6.7.3' and @testNumber = '4' and @failedChecks = '1')">Failed rules, Expected: 
-            6.7.3-7, 1 check, or 
-            6.7.3-3, 1 check, or 
-            6.7.3-5, 1 check, or 
+            (@clause = '6.7.3' and @testNumber = '7' and @failedChecks = '1')">Failed rules, Expected: 
+            6.1.4-3, 1 check, or 
             6.1.8-1, 11 checks, or 
-            6.3.5-3, 4 checks, or 
             6.2.3.3-3, 12 checks, or 
-            6.7.3-2, 1 check, or 
+            6.3.5-3, 4 checks, or 
             6.7.2-1, 1 check, or 
+            6.7.3-2, 1 check, or 
+            6.7.3-3, 1 check, or 
+            6.7.3-4, 1 check, or 
+            6.7.3-5, 1 check, or 
             6.7.3-6, 1 check, or 
-            6.7.3-4, 1 check</sch:assert>
+            6.7.3-7, 1 check</sch:assert>
         </sch:rule>
 
     </sch:pattern>
diff --git a/PDF_A-1b/1117/FULLTEXT01.sch b/PDF_A-1b/1117/FULLTEXT01.sch
index 31a9a52..ae6f757 100644
--- a/PDF_A-1b/1117/FULLTEXT01.sch
+++ b/PDF_A-1b/1117/FULLTEXT01.sch
@@ -16,28 +16,30 @@
 
     <sch:pattern name = "Checking the validationReport: rules">
         <sch:rule context="/report/jobs/job/validationReport/details">
-            <sch:assert test="(@failedRules = '9')">Failed check, Expected: 9</sch:assert>	
+            <sch:assert test="(@failedRules = '10')">Failed check, Expected: 10</sch:assert>	
         </sch:rule>
 
         <sch:rule context="/report/jobs/job/validationReport/details/rule">
-            <sch:assert test="(@clause = '6.7.11' and @testNumber = '1' and @failedChecks = '1') or 
+            <sch:assert test="(@clause = '6.1.4' and @testNumber = '3' and @failedChecks = '1') or 
+            (@clause = '6.2.3.3' and @testNumber = '1' and @failedChecks = '117') or 
+            (@clause = '6.2.3.3' and @testNumber = '3' and @failedChecks = '19254') or 
+            (@clause = '6.2.4' and @testNumber = '3' and @failedChecks = '4') or 
             (@clause = '6.3.4' and @testNumber = '1' and @failedChecks = '1') or 
-            (@clause = '6.4' and @testNumber = '5' and @failedChecks = '1') or 
-            (@clause = '6.2.3.3' and @testNumber = '3' and @failedChecks = '19254') or
             (@clause = '6.3.5' and @testNumber = '3' and @failedChecks = '3') or 
-            (@clause = '6.4' and @testNumber = '3' and @failedChecks = '34') or 
             (@clause = '6.4' and @testNumber = '2' and @failedChecks = '7') or 
-            (@clause = '6.2.4' and @testNumber = '3' and @failedChecks = '4') or 
-            (@clause = '6.2.3.3' and @testNumber = '1' and @failedChecks = '117')">Failed rules, Expected:
-            6.7.11-1, 1 check, or 
+            (@clause = '6.4' and @testNumber = '3' and @failedChecks = '34') or 
+            (@clause = '6.4' and @testNumber = '5' and @failedChecks = '1') or 
+            (@clause = '6.7.11' and @testNumber = '1' and @failedChecks = '1')">Failed rules, Expected: 
+            6.1.4-3, 1 check, or 
+            6.2.3.3-1, 117 checks, or 
+            6.2.3.3-3, 19254 checks, or 
+            6.2.4-3, 4 checks, or 
             6.3.4-1, 1 check, or 
-            6.4-5, 1 check, or 
-            6.2.3.3-3, 19254 checks, or
             6.3.5-3, 3 checks, or 
-            6.4-3, 34 checks, or 
             6.4-2, 7 checks, or 
-            6.2.4-3, 4 checks, or 
-            6.2.3.3-1, 117 checks</sch:assert>
+            6.4-3, 34 checks, or 
+            6.4-5, 1 check, or 
+            6.7.11-1, 1 check</sch:assert>
         </sch:rule>
 
     </sch:pattern>
diff --git a/PDF_A-1b/1200/m1-1-F.sch b/PDF_A-1b/1200/m1-1-F.sch
index f23783d..cf7eeb7 100644
--- a/PDF_A-1b/1200/m1-1-F.sch
+++ b/PDF_A-1b/1200/m1-1-F.sch
@@ -5,12 +5,25 @@
 
     <!-- Issue# 1200 -->
     <!-- https://github.com/veraPDF/veraPDF-library/issues/1200 -->
-    <!-- File: .\m1-1-F.pdf -->
+    <!-- File: m1-1-F.pdf -->
 
-    <sch:pattern name = "Checking the validationReport: profile">
+
+    <sch:pattern name = "Checking the validationReport: document is not compliant">
         <sch:rule context="/report/jobs/job/validationReport">
-            <sch:assert test="(@isCompliant = 'true')">Failed check, Expected: isCompliant=true</sch:assert>
+            <sch:assert test="(@isCompliant = 'false')">Failed check, Expected: isCompliant=false</sch:assert>
+        </sch:rule>
+    </sch:pattern>
+
+    <sch:pattern name = "Checking the validationReport: rules">
+        <sch:rule context="/report/jobs/job/validationReport/details">
+            <sch:assert test="(@failedRules = '1')">Failed check, Expected: 1</sch:assert>	
         </sch:rule>
+
+        <sch:rule context="/report/jobs/job/validationReport/details/rule">
+            <sch:assert test="(@clause = '6.1.4' and @testNumber = '3' and @failedChecks = '1')">Failed rules, Expected: 
+            6.1.4-3, 1 check</sch:assert>
+        </sch:rule>
+
     </sch:pattern>
 
     <sch:pattern name = "Checking for the absence of logs">
diff --git a/PDF_A-1b/737/thesis.test.sch b/PDF_A-1b/737/thesis.test.sch
index 359ef93..83a522f 100644
--- a/PDF_A-1b/737/thesis.test.sch
+++ b/PDF_A-1b/737/thesis.test.sch
@@ -14,56 +14,50 @@
         </sch:rule>
     </sch:pattern>
 
-	<sch:pattern name = "Checking the batchSummary">
-        <sch:rule context="/report/batchSummary">
-            <sch:assert test="(@totalJobs = '1' and @failedToParse = '0' and @encrypted = '0' and @outOfMemory = '0' and @veraExceptions = '0')">
-                Failed check, Expected: totalJobs = '1' failedToParse = '0' encrypted = '0' outOfMemory = '0' veraExceptions = '0'
-            </sch:assert>
-        </sch:rule>
-    </sch:pattern>
-		
     <sch:pattern name = "Checking the validationReport: rules">
         <sch:rule context="/report/jobs/job/validationReport/details">
-            <sch:assert test="(@failedRules = '18')">Failed check, Expected: 18</sch:assert>
+            <sch:assert test="(@failedRules = '19')">Failed check, Expected: 19</sch:assert>	
         </sch:rule>
 
         <sch:rule context="/report/jobs/job/validationReport/details/rule">
-            <sch:assert test="(@clause = '6.2.4' and @testNumber = '3' and @failedChecks = '1') or 
-			(@clause = '6.7.3' and @testNumber = '2' and @failedChecks = '1') or
-			(@clause = '6.7.3' and @testNumber = '3' and @failedChecks = '1') or
-			(@clause = '6.7.3' and @testNumber = '4' and @failedChecks = '1') or
-			(@clause = '6.7.3' and @testNumber = '5' and @failedChecks = '1') or
-			(@clause = '6.7.3' and @testNumber = '6' and @failedChecks = '1') or
-			(@clause = '6.7.3' and @testNumber = '7' and @failedChecks = '1') or
-			(@clause = '6.4' and @testNumber = '6' and @failedChecks = '10') or 
-			(@clause = '6.4' and @testNumber = '3' and @failedChecks = '642') or 
-			(@clause = '6.5.3' and @testNumber = '3' and @failedChecks = '470') or 
-			(@clause = '6.4' and @testNumber = '2' and @failedChecks = '34') or 
-            (@clause = '6.2.3.3' and @testNumber = '1' and @failedChecks = '567') or
-            (@clause = '6.2.3.3' and @testNumber = '3' and @failedChecks = '25144') or
-            (@clause = '6.7.2' and @testNumber = '1' and @failedChecks = '1') or 
+            <sch:assert test="(@clause = '6.1.4' and @testNumber = '3' and @failedChecks = '1') or 
+            (@clause = '6.2.3.3' and @testNumber = '1' and @failedChecks = '567') or 
+            (@clause = '6.2.3.3' and @testNumber = '3' and @failedChecks = '25144') or 
+            (@clause = '6.2.4' and @testNumber = '3' and @failedChecks = '1') or 
+            (@clause = '6.3.3.2' and @testNumber = '1' and @failedChecks = '2') or 
+            (@clause = '6.3.5' and @testNumber = '3' and @failedChecks = '2') or 
+            (@clause = '6.4' and @testNumber = '2' and @failedChecks = '34') or 
+            (@clause = '6.4' and @testNumber = '3' and @failedChecks = '642') or 
             (@clause = '6.4' and @testNumber = '5' and @failedChecks = '1') or 
-            (@clause = '6.3.3.2' and @testNumber = '1' and @failedChecks = '2') or
-			(@clause = '6.5.3' and @testNumber = '2' and @failedChecks = '470') or 
-            (@clause = '6.3.5' and @testNumber = '3' and @failedChecks = '2')">Failed rules, Expected: 
-            6.2.4-3, 1 check, or
-            6.7.3-1, 2 check, or
-            6.7.3-1, 3 check, or
-            6.7.3-1, 4 check, or
-            6.7.3-1, 5 check, or
-            6.7.3-1, 6 check, or
-            6.7.3-1, 7 check, or
-            6.4-6, 10 check, or
-            6.4-3, 642 checks, or
-            6.5.3-3, 470 checks, or
-            6.4-2, 34 checks, or
-            6.2.3.3-1, 567 checks, or
-			6.2.3.3-3, 25144 checks, or
-            6.7.2-1, 1 check, or
-			6.4-5, 1 check, or
-			6.3.3.2-1, 2 checks, or
-			6.5.3-2, 470 checks, or
-            6.3.5-3, 2 checks</sch:assert>
+            (@clause = '6.4' and @testNumber = '6' and @failedChecks = '10') or 
+            (@clause = '6.5.3' and @testNumber = '2' and @failedChecks = '470') or 
+            (@clause = '6.5.3' and @testNumber = '3' and @failedChecks = '470') or 
+            (@clause = '6.7.2' and @testNumber = '1' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '2' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '3' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '4' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '5' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '6' and @failedChecks = '1') or 
+            (@clause = '6.7.3' and @testNumber = '7' and @failedChecks = '1')">Failed rules, Expected: 
+            6.1.4-3, 1 check, or 
+            6.2.3.3-1, 567 checks, or 
+            6.2.3.3-3, 25144 checks, or 
+            6.2.4-3, 1 check, or 
+            6.3.3.2-1, 2 checks, or 
+            6.3.5-3, 2 checks, or 
+            6.4-2, 34 checks, or 
+            6.4-3, 642 checks, or 
+            6.4-5, 1 check, or 
+            6.4-6, 10 checks, or 
+            6.5.3-2, 470 checks, or 
+            6.5.3-3, 470 checks, or 
+            6.7.2-1, 1 check, or 
+            6.7.3-2, 1 check, or 
+            6.7.3-3, 1 check, or 
+            6.7.3-4, 1 check, or 
+            6.7.3-5, 1 check, or 
+            6.7.3-6, 1 check, or 
+            6.7.3-7, 1 check</sch:assert>
         </sch:rule>
 
     </sch:pattern>