--- a/RelaxNG/publiset.rnc	mar. juil. 19 11:01:54 2011 +0200
+++ b/RelaxNG/publiset.rnc	mar. juil. 19 13:25:35 2011 +0200
@@ -127,7 +127,7 @@
 
 publisher.content =
    label,
-   url?
+   link?
 
 # ~~~~~~ firstname
 firstname = element firstname { firstname.content }
@@ -151,11 +151,6 @@
    role.of.attribute
 role.of.attribute = attribute of { "author" | "illustrator" }
 
-# ~~~~~~ url
-url = element url { url.content }
-
-url.content = xsd:anyURI
-
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ source ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # ~~~~~~ source
@@ -243,19 +238,9 @@
    name.attribute
  & uri.attribute?
 name.attribute = attribute name { xsd:anyURI }
-uri.attribute = attribute uri { xsd:anyURI }
 
 file.content = inlines
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-link = element link { link.attributes, link.content }
-
-link.attributes =
-   uri.attribute
-
-link.content = inlines
-
 
 # =============================================================================
 #                                 INLINE LEVEL
@@ -274,6 +259,16 @@
 
 sub = element sub { inlines }
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+link = element link { link.attributes, link.content }
+
+link.attributes =
+   uri.attribute
+uri.attribute = attribute uri { xsd:anyURI }
+
+link.content = inlines
+
 
 # =============================================================================
 #                               REMAP ATTRIBUTES