# HG changeset patch
# User Patrick PIERRE
# Date 1425310294 -3600
# Node ID 1479d96b7f5f9f606dfa6ef04fd3f8552126674a
# Parent  1b39a8fc339f9c3b3abd70adaff15e81f8154f0d
Ajout des annotations

diff -r 1b39a8fc339f -r 1479d96b7f5f Data/Documents/torture_test.xml
--- a/Data/Documents/torture_test.xml	lun. mars 02 13:24:14 2015 +0100
+++ b/Data/Documents/torture_test.xml	lun. mars 02 16:31:34 2015 +0100
@@ -851,7 +851,10 @@
                     <entry>avion</entry>
                   </index>
                 </indexset>
-                <annotation>Ajouter des légendes.</annotation>
+                <annotation>
+                  <p>Ajouter des légendes.</p>
+                  <p>Vérifier les niveaux.</p>
+                </annotation>
               </head>
               <image id="f-gcru">
                 <hotspot x="68.2%" y="49.5%" w="7.5%" h="14.2%"
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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~