Attempts to clean up the schema; the SimpleLiteral stuff gave every appearance of...

diff --git a/docbook/relaxng/publishers/publishers/dcmitype.rnc b/docbook/relaxng/publishers/publishers/dcmitype.rnc
index 5404ab69722328021ad30993cd5da61830edcafd..ab3bf84630f0cd29a6f8b37c843a451804127637 100644 (file)
--- a/docbook/relaxng/publishers/publishers/dcmitype.rnc
+++ b/docbook/relaxng/publishers/publishers/dcmitype.rnc
@@ -24,7 +24,8 @@ a:documentation [
   " \x{a}" ~\r
   "  "\r
 ]\r
-DCMIType =\r
+\r
+DCMIType.enumeration =\r
   "Collection"\r
   | "Dataset"\r
   | "Event"\r
@@ -37,3 +38,5 @@ DCMIType =
   | "Sound"\r
   | "Text"\r
   | "PhysicalObject"\r
+\r
+DCMIType = DCMIType.enumeration\r

diff --git a/docbook/relaxng/publishers/publishers/dcterms.rnc b/docbook/relaxng/publishers/publishers/dcterms.rnc
index 25a1ac4153ba1cf109758c7ee1a70deeac3176ff..d6b9d9f1f47f3de703395f93cc155c02b4061e88 100644 (file)
--- a/docbook/relaxng/publishers/publishers/dcterms.rnc
+++ b/docbook/relaxng/publishers/publishers/dcterms.rnc
@@ -125,8 +125,6 @@ start |= dcterms.title
 | dcterms.license\r
 | dcterms.bibliographicCitation\r
 \r
-SimpleLiteral = element * { text }?\r
-dcterms.any = element any { SimpleLiteral }\r
 dcterms.title =\r
   [\r
     db:refpurpose [ "A name given to the resource."\r
@@ -457,25 +455,36 @@ dcterms.bibliographicCitation =
     ]\r
   ]\r
   element dcterms:bibliographicCitation { text }\r
-LCSH = SimpleLiteral, xsd:string\r
-MESH = SimpleLiteral, xsd:string\r
-DDC = SimpleLiteral, xsd:string\r
-LCC = SimpleLiteral, xsd:string\r
-UDC = SimpleLiteral, xsd:string\r
-Period = SimpleLiteral, xsd:string\r
+\r
+SimpleStringLiteral = element * { text }?\r
+SimpleURILiteral = element * { xsd:anyURI }?\r
+SimpleDCMITypeLiteral = element * { DCMIType.enumeration }?\r
+SimpleLanguageLiteral = element * { xsd:language }?\r
+SimpleLiteral =\r
+   (SimpleStringLiteral | SimpleURILiteral\r
+    | SimpleDCMITypeLiteral | SimpleLanguageLiteral)\r
+\r
+dcterms.any = element any { SimpleLiteral }\r
+\r
+LCSH = SimpleStringLiteral\r
+MESH = SimpleStringLiteral\r
+DDC = SimpleStringLiteral\r
+LCC = SimpleStringLiteral\r
+UDC = SimpleStringLiteral\r
+Period = SimpleStringLiteral\r
 W3CDTF = SimpleLiteral\r
-DCMIType |= SimpleLiteral, DCMIType\r
-IMT = SimpleLiteral, xsd:string\r
-URI = SimpleLiteral, xsd:anyURI\r
-ISO639-2 = SimpleLiteral, xsd:string\r
-ISO639-3 = SimpleLiteral, xsd:string\r
-RFC1766 = SimpleLiteral, xsd:language\r
-RFC3066 = SimpleLiteral, xsd:language\r
-RFC4646 = SimpleLiteral, xsd:language\r
-Point = SimpleLiteral, xsd:string\r
-ISO3166 = SimpleLiteral, xsd:string\r
-Box = SimpleLiteral, xsd:string\r
-TGN = SimpleLiteral, xsd:string\r
+DCMIType |= SimpleDCMITypeLiteral\r
+IMT = SimpleStringLiteral\r
+URI = SimpleURILiteral\r
+ISO639-2 = SimpleStringLiteral\r
+ISO639-3 = SimpleStringLiteral\r
+RFC1766 = SimpleLanguageLiteral\r
+RFC3066 = SimpleLanguageLiteral\r
+RFC4646 = SimpleLanguageLiteral\r
+Point = SimpleStringLiteral\r
+ISO3166 = SimpleStringLiteral\r
+Box = SimpleStringLiteral\r
+TGN = SimpleStringLiteral\r
 \r
 ##\r
 ##\r