Merge pull request #73 from ghackford-mitre/main

adding allOf to PAP schema and adding PAP:CLEAR

extension-definition-specifications/pap-marking-definition-f8d/STIX-2.1-PAP-marking-definition.adoc

@@ -107,6 +107,8 @@ PAP:AMBER
 
 PAP:RED
 
+PAP:CLEAR
+
 |*extensions* (required)
 |[stixtype]#{dictionary_url}[dictionary]#
 |Specifies the PAP marking “color” as an extension dictionary.
@@ -138,7 +140,8 @@ The value of this property *MUST* be [stixliteral]#property-extension#
 white, 
 green,
 amber,
-red
+red,
+clear
 |===
 
 [[marking-definition]]
@@ -169,7 +172,12 @@ a|red
 a|
 ----
 include::examples/pap-red.json[]
-
+----
+a|clear
+[source,json]
+a|
+----
+include::examples/pap-clear.json[]
 ----
 |===
 

extension-definition-specifications/pap-marking-definition-f8d/examples/pap-clear.json

@@ -0,0 +1,13 @@
+{ 
+    "type": "marking-definition", 
+    "spec_version": "2.1", 
+    "id": "marking-definition--ad15a0cd-55b6-4588-a14c-a66105329b92", 
+    "created": "2022-10-01T00:00:00.000Z", 
+    "name": "PAP:CLEAR",
+    "extensions": {
+        "extension-definition--f8d78575-edfd-406e-8e84-6162a8450f5b": {
+            "extension_type": "property-extension",
+            "pap": "clear"
+        }
+    }
+}