From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 1 Apr 2010 23:05:10 +0000 (+0000)
Subject: Attempts to clean up the schema; the SimpleLiteral stuff gave every appearance of... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa2ee2621b05d40c65b1d2e88af3035a54c930c7;p=docbook-dsssl

Attempts to clean up the schema; the SimpleLiteral stuff gave every appearance of being an erroneous translation of some XSD
---

diff --git a/docbook/relaxng/publishers/publishers/dcmitype.rnc b/docbook/relaxng/publishers/publishers/dcmitype.rnc
index 5404ab697..ab3bf8463 100644
--- a/docbook/relaxng/publishers/publishers/dcmitype.rnc
+++ b/docbook/relaxng/publishers/publishers/dcmitype.rnc
@@ -24,7 +24,8 @@ a:documentation [
   " \x{a}" ~
   "  "
 ]
-DCMIType =
+
+DCMIType.enumeration =
   "Collection"
   | "Dataset"
   | "Event"
@@ -37,3 +38,5 @@ DCMIType =
   | "Sound"
   | "Text"
   | "PhysicalObject"
+
+DCMIType = DCMIType.enumeration
diff --git a/docbook/relaxng/publishers/publishers/dcterms.rnc b/docbook/relaxng/publishers/publishers/dcterms.rnc
index 25a1ac415..d6b9d9f1f 100644
--- a/docbook/relaxng/publishers/publishers/dcterms.rnc
+++ b/docbook/relaxng/publishers/publishers/dcterms.rnc
@@ -125,8 +125,6 @@ start |= dcterms.title
 | dcterms.license
 | dcterms.bibliographicCitation
 
-SimpleLiteral = element * { text }?
-dcterms.any = element any { SimpleLiteral }
 dcterms.title =
   [
     db:refpurpose [ "A name given to the resource."
@@ -457,25 +455,36 @@ dcterms.bibliographicCitation =
     ]
   ]
   element dcterms:bibliographicCitation { text }
-LCSH = SimpleLiteral, xsd:string
-MESH = SimpleLiteral, xsd:string
-DDC = SimpleLiteral, xsd:string
-LCC = SimpleLiteral, xsd:string
-UDC = SimpleLiteral, xsd:string
-Period = SimpleLiteral, xsd:string
+
+SimpleStringLiteral = element * { text }?
+SimpleURILiteral = element * { xsd:anyURI }?
+SimpleDCMITypeLiteral = element * { DCMIType.enumeration }?
+SimpleLanguageLiteral = element * { xsd:language }?
+SimpleLiteral =
+   (SimpleStringLiteral | SimpleURILiteral
+    | SimpleDCMITypeLiteral | SimpleLanguageLiteral)
+
+dcterms.any = element any { SimpleLiteral }
+
+LCSH = SimpleStringLiteral
+MESH = SimpleStringLiteral
+DDC = SimpleStringLiteral
+LCC = SimpleStringLiteral
+UDC = SimpleStringLiteral
+Period = SimpleStringLiteral
 W3CDTF = SimpleLiteral
-DCMIType |= SimpleLiteral, DCMIType
-IMT = SimpleLiteral, xsd:string
-URI = SimpleLiteral, xsd:anyURI
-ISO639-2 = SimpleLiteral, xsd:string
-ISO639-3 = SimpleLiteral, xsd:string
-RFC1766 = SimpleLiteral, xsd:language
-RFC3066 = SimpleLiteral, xsd:language
-RFC4646 = SimpleLiteral, xsd:language
-Point = SimpleLiteral, xsd:string
-ISO3166 = SimpleLiteral, xsd:string
-Box = SimpleLiteral, xsd:string
-TGN = SimpleLiteral, xsd:string
+DCMIType |= SimpleDCMITypeLiteral
+IMT = SimpleStringLiteral
+URI = SimpleURILiteral
+ISO639-2 = SimpleStringLiteral
+ISO639-3 = SimpleStringLiteral
+RFC1766 = SimpleLanguageLiteral
+RFC3066 = SimpleLanguageLiteral
+RFC4646 = SimpleLanguageLiteral
+Point = SimpleStringLiteral
+ISO3166 = SimpleStringLiteral
+Box = SimpleStringLiteral
+TGN = SimpleStringLiteral
 
 ##
 ##