# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1307716510 -7200
# Node ID 1d4ee28efd6843a247a3fdfb9edca90023450f3f
# Parent  4f3dcb980cd11c138ff78be17e17fb3451df84a2
Mise en forme

diff -r 4f3dcb980cd1 -r 1d4ee28efd68 RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	mar. juin 07 11:11:29 2011 +0200
+++ b/RelaxNG/publidoc.rnc	ven. juin 10 16:35:10 2011 +0200
@@ -293,9 +293,10 @@
  & note*
  & foreign*
  & highlight*
- & term*
  & mentioned*
  & quote*
+ & acronym*
+ & term*
 }
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sub, sup ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -355,12 +356,6 @@
 
 highlight.content = inlines
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ term ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-term = element term { term.content }
-
-term.content = inlines
-
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mentioned ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 mentioned = element mentioned { mentioned.content }
@@ -373,6 +368,18 @@
 
 quote.content = inlines
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ acronym ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+acronym = element acronym { acronym.content }
+
+acronym.content = inlines
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ term ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+term = element term { term.content }
+
+term.content = inlines
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 link = element link { link.attributes, link.content }
diff -r 4f3dcb980cd1 -r 1d4ee28efd68 RelaxNG/publidoc.rng
--- a/RelaxNG/publidoc.rng	mar. juin 07 11:11:29 2011 +0200
+++ b/RelaxNG/publidoc.rng	ven. juin 10 16:35:10 2011 +0200
@@ -551,6 +551,9 @@
         <zeroOrMore>
           <ref name="quote"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="acronym"/>
+        </zeroOrMore>
       </interleave>
     </mixed>
   </define>
@@ -704,6 +707,15 @@
   <define name="quote.content">
     <ref name="inlines"/>
   </define>
+  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ acronym ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <define name="acronym">
+    <element name="acronym">
+      <ref name="acronym.content"/>
+    </element>
+  </define>
+  <define name="acronym.content">
+    <ref name="inlines"/>
+  </define>
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <define name="link">
     <element name="link">