[MOD] new element active-group, re Schematron/schematron-enhancement-…

…proposals#25

new element error in (active-*), re Schematron/schematron-enhancement-proposals#47
new attribute severity, re Schematron/schematron-enhancement-proposals#58

svrl.rnc

@@ -1,4 +1,4 @@
-# Copyright © ISO/IEC 2019
+# Copyright © ISO/IEC 2024
 # 
 # The following permission notice and disclaimer shall be included in all 
 # copies of this XML schema ("the Schema"), and derivations of the Schema: 
@@ -34,7 +34,7 @@ schematron-output =
         attribute schemaVersion { text }?,
         human-text*,
         ns-prefix-in-attribute-values*,
-        (active-pattern,
+        (active-pattern-rule-set,
          (fired-rule, (failed-assert | successful-report)*)*)+
     }
 # only namespaces from sch:ns need to be reported 
@@ -44,15 +44,15 @@ ns-prefix-in-attribute-values =
         attribute uri { text },
         empty
     }
-# only active patterns are reported 
+# only active patterns and groups are reported 
 active-pattern =
     element active-pattern {
-        attribute id { xsd:NCName }?,
-        attribute documents { text }?,
-        attribute name { text }?,
-        attribute role { string }?,
-        empty
+        active
     }
+active-rule-set =
+    element active-group {
+        active
+    }    
 # only rules that are fired are reported, 
 fired-rule =
     element fired-rule {
@@ -73,12 +73,12 @@ diagnostic-reference =
 # only failed assertions are reported 
 failed-assert =
     element failed-assert {
-        attlist.assert-and-report, diagnostic-reference*, property-reference*, human-text
+        assertion-message
     }
 # only successful asserts are reported 
 successful-report =
     element successful-report {
-        attlist.assert-and-report, diagnostic-reference*, property-reference*, human-text
+        assertion-message
     }
 # property-reference 
 property-reference =
@@ -88,6 +88,14 @@ property-reference =
         attribute scheme { text }?,
         human-text
     }
+# errors raised in evaluating pattern/@documents
+error =
+    element error {
+        attribute document { xsd:anyURI },
+        attribute location { text },
+        attribute code { text }?,
+        rich-text
+    }
 # human text 
 human-text =
     element text {
@@ -133,5 +141,21 @@ attlist.assert-and-report =
     attribute location { text },
     attribute test { text },
     attribute role { string }?,
-    attribute flag { string }?
+    attribute flag { string }?,
+    attribute severity { string }?
+
+# active patterns and rule-sets
+active-pattern-rule-set =
+    active-pattern | active-rule-set
+active =
+    attribute id { xsd:NCName }?,
+    attribute documents { text }?,
+    attribute name { text }?,
+    attribute role { string }?,
+    error*
+
+# assert and report message
+assertion-message = 
+    attlist.assert-and-report, diagnostic-reference*, property-reference*, human-text
+
 start = schematron-output