# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1308064426 -7200
# Node ID d77ae7040e3e70b9b1092778b9659ba51e0066b9
# Parent  53a80accc24832fbae6fd6a4307471d7cd6c06cd
link dans inline

diff -r 53a80accc248 -r d77ae7040e3e RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	lun. juin 13 18:55:59 2011 +0200
+++ b/RelaxNG/publidoc.rnc	mar. juin 14 17:13:46 2011 +0200
@@ -247,7 +247,6 @@
 
 p.content =
    inlines
- & link*
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ speech ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -411,6 +410,7 @@
  & quote*
  & acronym*
  & term*
+ & link*
 }
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sub, sup ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -r 53a80accc248 -r d77ae7040e3e RelaxNG/publidoc.rng
--- a/RelaxNG/publidoc.rng	lun. juin 13 18:55:59 2011 +0200
+++ b/RelaxNG/publidoc.rng	mar. juin 14 17:13:46 2011 +0200
@@ -506,12 +506,7 @@
     </element>
   </define>
   <define name="p.content">
-    <interleave>
-      <ref name="inlines"/>
-      <zeroOrMore>
-        <ref name="link"/>
-      </zeroOrMore>
-    </interleave>
+    <ref name="inlines"/>
   </define>
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ speech ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <!-- ~~~~~~ speech -->
@@ -887,6 +882,9 @@
         <zeroOrMore>
           <ref name="term"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="link"/>
+        </zeroOrMore>
       </interleave>
     </mixed>
   </define>