From a1a5660ea761291818b0e8edf853777600cff9da Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Sat, 5 Mar 2022 12:32:42 -0500 Subject: [PATCH] Integrate use of oscal-prose-module.xsd in metaschema.xsd (#187) * refactored markup use in the Metaschema XSD to make use of the oscal-prose-module.xsd * Refactored prose module to allow img tags in markup. Resolves usnistgov/OSCAL#1132 --- .../xslt-M4/schema-gen/oscal-prose-module.xsd | 137 +++++++++--------- toolchains/xslt-M4/validate/metaschema.xsd | 96 ++++-------- 2 files changed, 97 insertions(+), 136 deletions(-) diff --git a/toolchains/xslt-M4/schema-gen/oscal-prose-module.xsd b/toolchains/xslt-M4/schema-gen/oscal-prose-module.xsd index 265f364af..555ab46fc 100644 --- a/toolchains/xslt-M4/schema-gen/oscal-prose-module.xsd +++ b/toolchains/xslt-M4/schema-gen/oscal-prose-module.xsd @@ -1,32 +1,34 @@ - + - + + + - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - The content model is the same as blockElementType, but line endings need - to be preserved, since this is preformatted. - - - + + + + - + - The content model is the same as blockElementType, but line endings need + The content model is the same as inlineType, but line endings need to be preserved, since this is preformatted. @@ -71,8 +64,9 @@ + - + @@ -86,17 +80,20 @@ - + - - - - + + + + + + + @@ -107,44 +104,46 @@ - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + - - + + + + diff --git a/toolchains/xslt-M4/validate/metaschema.xsd b/toolchains/xslt-M4/validate/metaschema.xsd index b15c635fe..1b201fcce 100644 --- a/toolchains/xslt-M4/validate/metaschema.xsd +++ b/toolchains/xslt-M4/validate/metaschema.xsd @@ -4,6 +4,12 @@ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" targetNamespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"> + + + This prose module provides support for line and multiline markup. + + + @@ -73,7 +79,7 @@ + type="InlineFlagDefinitionType"/> @@ -91,8 +97,8 @@ - - + + @@ -136,7 +142,7 @@ In JSON, an object with a nominal string value (potentially with internal - inline - not fully structured - markup). In XML, an element with string or mixed + inline - not fully structured - markup). In XML, an element with string or markup content. Defined globally, a field can be assigned to appear in the model of any assembly by field reference. @@ -146,7 +152,8 @@ - + @@ -182,10 +189,10 @@ - + In JSON, an object with a nominal string value (potentially with internal - inline - not fully structured - markup). In XML, an element with string or mixed + inline - not fully structured - markup). In XML, an element with string or markup content. A local definition describes and constrains the appearance of the field only in this (assembly) context. @@ -196,7 +203,8 @@ - + @@ -210,10 +218,10 @@ - + In JSON, an object with a nominal string value (potentially with internal - inline - not fully structured - markup). In XML, an element with string or mixed + inline - not fully structured - markup). In XML, an element with string or markup content. A local definition describes and constrains the appearance of the field only in this (assembly) context. @@ -225,7 +233,7 @@ + type="InlineFlagDefinitionType"/> @@ -245,7 +253,7 @@ - + A data point to be expressed as an attribute in the XML or a name/value pair in the JSON. A local definition describes and constrains the appearance of the flag only in its parent (assembly or field) context. @@ -288,24 +296,8 @@ The JSON Base URI is nominal base URI assigned to a JSON Schema instance expressing the model defined by this metaschema. - - - - - - - - - - - - - - - - - - + + A short description of the data construct, to be inserted into documentation. Unlike 'formal-name' this should not simply repeat what is readily @@ -321,7 +313,7 @@ - + Mark as 'XML' for XML-only or 'JSON' for JSON-only remarks. @@ -332,29 +324,16 @@ - - - - - - - + The name of the information model to be represented by derived schemas. - - - - - - - + The version of the information model to be represented by derived schemas. - @@ -368,7 +347,7 @@ To import a set of declarations from an out-of-line schema, supporting reuse of common information structures. - + A relative or absolute URI for retrieving an out-of-line metaschema module. @@ -524,7 +503,7 @@ - + A value recognized for a flag or field. @@ -542,23 +521,6 @@ - - - A paragraph or paragraph fragment, in documentation. - - - - - - - - - - - - - - @@ -942,8 +904,8 @@ - - + +