diff -r 1b39a8fc339f -r 1479d96b7f5f RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	lun. mars 02 13:24:14 2015 +0100
+++ b/RelaxNG/publidoc.rnc	lun. mars 02 16:31:34 2015 +0100
@@ -113,7 +113,7 @@
 source.content.file =
    identifier.uri
 source.content =
-   annotation*
+   annotation?
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ keyword & subject ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -183,7 +183,8 @@
 
 annotation = element annotation { annotation.content }
 
-annotation.content = inlines
+annotation.content =
+   inlines | p+
 
 
 # =============================================================================
@@ -208,7 +209,7 @@
  & indexset?
  & abstract?
  & cover?
- & annotation*
+ & annotation?
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ document ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -256,7 +257,7 @@
    (title, shorttitle?, subtitle*)?
  & indexset?
  & abstract?
- & annotation*
+ & annotation?
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ division ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -296,7 +297,7 @@
  & subjectset?
  & indexset?
  & abstract?
- & annotation*
+ & annotation?
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ topic ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -330,7 +331,7 @@
  & indexset?
  & abstract?
  & audio*
- & annotation*
+ & annotation?
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -381,7 +382,7 @@
 block.head.content =
    (title, shorttitle?, subtitle*)?
  & indexset?
- & annotation*
+ & annotation?
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ block ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~