diff --git a/build/metaschema/json/json-schema-metamap.xsl b/build/metaschema/json/json-schema-metamap.xsl
index 460b039366..7119cd3402 100644
--- a/build/metaschema/json/json-schema-metamap.xsl
+++ b/build/metaschema/json/json-schema-metamap.xsl
@@ -37,7 +37,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -220,18 +261,18 @@
-
+
-
+
@@ -245,8 +286,6 @@
string
-
@@ -314,7 +353,7 @@
match="assembly[empty(@max-occurs) or number(@max-occurs) = 1 ] |
field[empty(@max-occurs) or number(@max-occurs)= 1 ]">
-
+
#/definitions/{ @ref }
@@ -376,6 +415,23 @@
string
+
+
+
+ string
+
+
+ array
+
+
+ string
+
+
+ 2
+
+
+
+
@@ -397,7 +453,7 @@
integer
- 1.0
+
@@ -434,9 +490,9 @@
string
- date
+
-
+ ((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})string
diff --git a/build/metaschema/json/pull-datatypes.xsl b/build/metaschema/json/pull-datatypes.xsl
index 5f7f22b2af..76e78f5d49 100644
--- a/build/metaschema/json/pull-datatypes.xsl
+++ b/build/metaschema/json/pull-datatypes.xsl
@@ -11,6 +11,8 @@
+
+
@@ -68,4 +70,8 @@
{ @value }
+
+
\ No newline at end of file
diff --git a/build/metaschema/lib/metaschema-check.sch b/build/metaschema/lib/metaschema-check.sch
index 481d9daa86..e07aef8f91 100644
--- a/build/metaschema/lib/metaschema-check.sch
+++ b/build/metaschema/lib/metaschema-check.sch
@@ -18,6 +18,8 @@
+
+
@@ -41,10 +43,11 @@
formal-name missing from description missing from model missing from
- Definition set to address by '', but no flag with that name is declared.Property defined as boolean may not have flags. is assigned a json key, but no 'json-key' is given
+ Names "STRVALUE", "RICHTEXT" or "PROSE" (reserved names)
+
@@ -84,12 +87,10 @@
No definition found for '' Flag data type doesn't match: the definition has ''Flag should not be named "STRVALUE", "RICHTEXT" or "PROSE" (reserved names)
+ Flag is declared with datatype '' while other flags with that name show datatype
+
-
- Prose may not appear in more than once in a model
-
-
@@ -118,7 +119,8 @@
-->
-
+ Only one field may be marked
+ as 'markup-multiline' (without xml wrapping) within a model.
diff --git a/build/metaschema/lib/metaschema-docs-util.xsl b/build/metaschema/lib/metaschema-docs-util.xsl
index b7aced3db7..f0a09dc06e 100644
--- a/build/metaschema/lib/metaschema-docs-util.xsl
+++ b/build/metaschema/lib/metaschema-docs-util.xsl
@@ -91,17 +91,17 @@ function switch_view(who,flag) {
-
+
-