--- a/RelaxNG/publiset.rnc	jeu. nov. 20 09:26:29 2014 +0100
+++ b/RelaxNG/publiset.rnc	jeu. nov. 20 17:37:00 2014 +0100
@@ -114,7 +114,7 @@
  & collection?
  & folio?
  & pages?
- 
+
 source.content.file =
    identifier.uri
 
@@ -309,7 +309,7 @@
 selection.file.attributes =
    path.attribute?
 argument.attribute = attribute argument { text }
-   
+
 file.content = xsd:anyURI
 
 
@@ -334,18 +334,16 @@
 simple.inlines = mixed {
    sup*
  & sub*
- & date*
- & name*
 }
 
 inlines = mixed {
    sup*
  & sub*
- & date*
- & name*
 
  & highlight*
  & emphasis*
+ & name*
+ & date*
  & link*
 }
 
@@ -355,28 +353,6 @@
 
 sub = element sub { inlines }
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ date ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-date = element date { date.attributes, date.content }
-
-date.attributes =
-   date.value.attribute
-date.value.attribute = attribute value { xsd:date | xsd:gYearMonth | xsd:gYear }
-
-date.content = mixed { sup* }
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-name = element name { name.attributes, name.content }
-
-name.attributes =
-   name.of.attribute?
-name.of.attribute = attribute of {
-   "person" | "company" | "book" | "newspaper" | "party" | "painting"
- | "movie" }
-
-name.content = mixed { sup* }
-
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ highlight ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 highlight = element highlight { highlight.content }
@@ -389,6 +365,28 @@
 
 emphasis.content = inlines
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+name = element name { name.attributes, name.content }
+
+name.attributes =
+   name.of.attribute?
+name.of.attribute = attribute of {
+   "person" | "company" | "book" | "newspaper" | "party" | "movie"
+ | "painting" }
+
+name.content = mixed { sup* }
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ date ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+date = element date { date.attributes, date.content }
+
+date.attributes =
+   date.value.attribute
+date.value.attribute = attribute value { xsd:date | xsd:gYearMonth | xsd:gYear }
+
+date.content = mixed { sup* }
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 link = element link { link.attributes, link.content }