From 94a3fc4985e50f82f83c550c9744cf5e461bc849 Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Wed, 29 Dec 2021 19:51:31 +0100
Subject: [PATCH] Using attribute group for rich attrs

---
 .../src/main/resources/schemas/svrl.xsd       | 29 ++++++++-----------
 .../xpath/PSXPathValidationHandlerSVRL.java   | 10 +++++++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ph-schematron-api/src/main/resources/schemas/svrl.xsd b/ph-schematron-api/src/main/resources/schemas/svrl.xsd
index b6d82cb53..fe608064e 100644
--- a/ph-schematron-api/src/main/resources/schemas/svrl.xsd
+++ b/ph-schematron-api/src/main/resources/schemas/svrl.xsd
@@ -70,10 +70,7 @@
       <xs:attribute name="context" type="xs:string" use="required"/>
       <xs:attribute name="role" type="xs:NMTOKEN"/>
       <xs:attribute name="flag" type="xs:NMTOKEN"/>
-      <!-- [ph] if 'allowForeignElements' is enabled the following three can occur: -->
-      <xs:attribute name="see" type="xs:string" use="optional"/>
-      <xs:attribute name="icon" type="xs:string" use="optional"/>
-      <xs:attribute name="fpi" type="xs:string" use="optional"/>
+      <xs:attributeGroup ref="svrl:attlist.rich"/>
     </xs:complexType>
   </xs:element>
   <!-- only references are reported, not the diagnostic -->
@@ -83,12 +80,7 @@
         <xs:element ref="svrl:text" minOccurs="0" maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="diagnostic" use="required" type="xs:NMTOKEN"/>
-      <xs:attribute ref="xml:lang" use="optional" />
-      <xs:attribute ref="xml:space" use="optional" />
-      <!-- [ph] if 'allowForeignElements' is enabled the following three can occur: -->
-      <xs:attribute name="see" type="xs:string" use="optional"/>
-      <xs:attribute name="icon" type="xs:string" use="optional"/>
-      <xs:attribute name="fpi" type="xs:string" use="optional"/>
+      <xs:attributeGroup ref="svrl:attlist.rich"/>
     </xs:complexType>
   </xs:element>
   <!-- only failed assertions are reported -->
@@ -131,9 +123,7 @@
     <xs:complexType>
       <xs:complexContent>
         <xs:extension base="svrl:rich-text">
-          <xs:attribute name="see"/>
-          <xs:attribute name="icon"/>
-          <xs:attribute name="fpi"/>
+          <xs:attributeGroup ref="svrl:attlist.rich"/>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>
@@ -178,6 +168,14 @@
       <xs:any namespace="##local" processContents="skip"/>
     </xs:choice>
   </xs:group>
+  <xs:attributeGroup name="attlist.rich">
+    <xs:attribute ref="xml:lang" use="optional" />
+    <xs:attribute ref="xml:space" use="optional" />
+    <!-- [ph] if 'allowForeignElements' is enabled the following three can occur: -->
+    <xs:attribute name="see" type="xs:string" use="optional"/>
+    <xs:attribute name="icon" type="xs:string" use="optional"/>
+    <xs:attribute name="fpi" type="xs:string" use="optional"/>
+  </xs:attributeGroup>
   <xs:attributeGroup name="attlist.assert-and-report">
     <!-- [ph] changed from ID to NCName for real-life handling -->
     <xs:attribute name="id" type="xs:NCName"/>
@@ -185,9 +183,6 @@
     <xs:attribute name="test" use="required"/>
     <xs:attribute name="role" type="xs:NMTOKEN"/>
     <xs:attribute name="flag" type="xs:NMTOKEN"/>
-    <!-- [ph] if 'allowForeignElements' is enabled the following three can occur: -->
-    <xs:attribute name="see" type="xs:string" use="optional"/>
-    <xs:attribute name="icon" type="xs:string" use="optional"/>
-    <xs:attribute name="fpi" type="xs:string" use="optional"/>
+    <xs:attributeGroup ref="svrl:attlist.rich"/>
   </xs:attributeGroup>
 </xs:schema>
diff --git a/ph-schematron-pure/src/main/java/com/helger/schematron/pure/validation/xpath/PSXPathValidationHandlerSVRL.java b/ph-schematron-pure/src/main/java/com/helger/schematron/pure/validation/xpath/PSXPathValidationHandlerSVRL.java
index fa550e90b..d15b89d3b 100644
--- a/ph-schematron-pure/src/main/java/com/helger/schematron/pure/validation/xpath/PSXPathValidationHandlerSVRL.java
+++ b/ph-schematron-pure/src/main/java/com/helger/schematron/pure/validation/xpath/PSXPathValidationHandlerSVRL.java
@@ -187,6 +187,16 @@ public void onFiredRule (@Nonnull final PSRule aRule,
     aRetRule.setId (aRule.getID ());
     if (aRule.hasLinkable ())
       aRetRule.setRole (aRule.getLinkable ().getRole ());
+    final PSRichGroup aRich = aRule.getRich ();
+    if (aRich != null)
+    {
+      aRetRule.setLang (aRich.getXmlLang ());
+      if (aRich.hasXmlSpace ())
+        aRetRule.setSpace (aRich.getXmlSpace ().getID ());
+      aRetRule.setIcon (aRich.getIcon ());
+      aRetRule.setSee (aRich.getSee ());
+      aRetRule.setFpi (aRich.getFPI ());
+    }
     m_aSchematronOutput.getActivePatternAndFiredRuleAndFailedAssert ().add (aRetRule);
   }