--- a/RelaxNG/publiset.rng	mar. juil. 19 11:01:54 2011 +0200
+++ b/RelaxNG/publiset.rng	mar. juil. 19 13:25:35 2011 +0200
@@ -270,7 +270,7 @@
   <define name="publisher.content">
     <ref name="label"/>
     <optional>
-      <ref name="url"/>
+      <ref name="link"/>
     </optional>
   </define>
   <!-- ~~~~~~ firstname -->
@@ -317,15 +317,6 @@
       </choice>
     </attribute>
   </define>
-  <!-- ~~~~~~ url -->
-  <define name="url">
-    <element name="url">
-      <ref name="url.content"/>
-    </element>
-  </define>
-  <define name="url.content">
-    <data type="anyURI"/>
-  </define>
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ source ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <!-- ~~~~~~ source -->
   <define name="source">
@@ -505,27 +496,9 @@
       <data type="anyURI"/>
     </attribute>
   </define>
-  <define name="uri.attribute">
-    <attribute name="uri">
-      <data type="anyURI"/>
-    </attribute>
-  </define>
   <define name="file.content">
     <ref name="inlines"/>
   </define>
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <define name="link">
-    <element name="link">
-      <ref name="link.attributes"/>
-      <ref name="link.content"/>
-    </element>
-  </define>
-  <define name="link.attributes">
-    <ref name="uri.attribute"/>
-  </define>
-  <define name="link.content">
-    <ref name="inlines"/>
-  </define>
   <!--
     =============================================================================
                                     INLINE LEVEL
@@ -555,6 +528,24 @@
       <ref name="inlines"/>
     </element>
   </define>
+  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <define name="link">
+    <element name="link">
+      <ref name="link.attributes"/>
+      <ref name="link.content"/>
+    </element>
+  </define>
+  <define name="link.attributes">
+    <ref name="uri.attribute"/>
+  </define>
+  <define name="uri.attribute">
+    <attribute name="uri">
+      <data type="anyURI"/>
+    </attribute>
+  </define>
+  <define name="link.content">
+    <ref name="inlines"/>
+  </define>
   <!--
     =============================================================================
                                   REMAP ATTRIBUTES