--- a/RelaxNG/publidoc.rnc	jeu. juin 20 19:11:34 2013 +0200
+++ b/RelaxNG/publidoc.rnc	ven. juin 21 19:28:26 2013 +0200
@@ -266,8 +266,9 @@
 # ~~~~~~ attribution
 attribution = element attribution { attribution.content }
 
-attribution.content =
-   inlines
+attribution.content = mixed {
+   sup* & number* & date* & name* & foreign* & acronym* & term* & literal*
+ & highlight* & mentioned* & warning* }
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -658,11 +659,11 @@
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sub, sup, var ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-sup = element sup { text }
+sup = element sup { mixed { warning* } }
 
-sub = element sub { text }
+sub = element sub { mixed { warning* } }
 
-var = element var { text }
+var = element var { mixed { warning* } }
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ number ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -689,7 +690,7 @@
    wide.attribute?
 wide.attribute = attribute wide { xsd:boolean }
 
-math.content = mixed { sup* & sub* & var* }
+math.content = mixed { sup* & sub* & var* & warning* }
 math.tex.content = text
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ date ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -802,7 +803,7 @@
 uri.attribute = attribute uri { xsd:anyURI }
 idref.attribute = attribute idref { xsd:IDREF }
 
-link.content =  mixed {
+link.content = mixed {
    sup* & sub* & var* & number* & math* & date* & name* & foreign* & acronym*
  & term* & literal* & stage* & highlight* & mentioned* & warning* }
 
@@ -834,4 +835,4 @@
 
 warning = element warning { warning.content }
 
-warning.content = inlines
+warning.content = text