--- a/RelaxNG/publidoc.rnc	ven. nov. 01 13:31:18 2013 +0100
+++ b/RelaxNG/publidoc.rnc	mer. nov. 06 16:23:51 2013 +0100
@@ -27,7 +27,7 @@
 
 top.head.content =
    (title, shorttitle?, subtitle*)?
- & (identifier, identifier?)?
+ & identifier*
  & copyright*
  & collection?
  & contributors?
@@ -543,18 +543,24 @@
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ identifier ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-identifier = element identifier {
-   (attribute type { "ean" }, xsd:token {pattern = "\d{13}"})
- | (attribute type { "uri" }, xsd:anyURI)
-}
+# ~~~~~~ identifier
+identifier = identifier.uri | identifier.ean
 
-identifier.ean = element identifier {
-   attribute type { "ean" }, xsd:token {pattern = "\d{13}"}
-}
+# ~~~~~~ identifier.uri
+identifier.uri = element identifier { identifier.uri.attributes }
 
-identifier.uri = element identifier {
-   attribute type { "uri" }, xsd:anyURI
-}
+identifier.uri.attributes =
+   type_uri.attribute
+ & for.attribute?
+type_uri.attribute = attribute type { "uri" }, xsd:anyURI
+
+# ~~~~~~ identifier.ean
+identifier.ean = element identifier { identifier.ean.attributes }
+
+identifier.ean.attributes =
+   type_ean.attribute
+ & for.attribute?
+type_ean.attribute = attribute type { "ean" }, xsd:token {pattern = "\d{13}"}
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ copyright ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~