--- a/RelaxNG/publiset.rnc	dim. juin 23 12:11:00 2013 +0200
+++ b/RelaxNG/publiset.rnc	lun. juin 24 00:51:01 2013 +0200
@@ -308,10 +308,11 @@
 
 name.attributes =
    name.of.attribute?
-name.of.attribute = attribute of
-   { "person" | "company" | "book" | "newspaper" | "party" | "painting" }
+name.of.attribute = attribute of {
+   "person" | "company" | "book" | "newspaper" | "party" | "painting"
+ | "movie" }
 
-name.content = inlines
+name.content = mixed { sup* }
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ highlight ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -327,7 +328,7 @@
    uri.attribute
 uri.attribute = attribute uri { xsd:anyURI }
 
-link.content = inlines
+link.content = mixed { sup* & sub* & date* & name* & highlight* }
 
 
 # =============================================================================