# HG changeset patch
# User Coraline MARKWITZ
# Date 1468339100 -7200
# Node ID 730c4c3055450841cae23fd50694839e205045d4
# Parent  0c622a109d2f9a0a78c0543ef08f69f20d193458
maj glossary

diff -r 0c622a109d2f -r 730c4c305545 Data/Documents/torture_test.xml
--- a/Data/Documents/torture_test.xml	mer. juin 29 14:55:53 2016 +0200
+++ b/Data/Documents/torture_test.xml	mar. juil. 12 17:58:20 2016 +0200
@@ -1187,7 +1187,20 @@
     </division>
 
     <!-- ================================================================== -->
-    <glossary langfrom="fr" langto="en">
+    <glossary xml:lang="fr" langto="en">
+      <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+      <entry xml:id="danseur">
+        <mainterm>danseur</mainterm>
+        <alt-terms>
+          <alt-term type="fem">danseuse</alt-term>
+        </alt-terms>
+        <meanings gramcode="nom">
+          <meaning>
+            <definition>Personne qui danse à titre professionnel ou par plaisir.</definition>
+            <translation>dancer</translation>
+          </meaning>
+        </meanings>
+      </entry>
       <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
       <entry xml:id="grace">
         <mainterm>grâce</mainterm>
diff -r 0c622a109d2f -r 730c4c305545 RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	mer. juin 29 14:55:53 2016 +0200
+++ b/RelaxNG/publidoc.rnc	mar. juil. 12 17:58:20 2016 +0200
@@ -252,10 +252,9 @@
 
 glossary.attributes =
    glossary.type.attribute?
- & langfrom.attribute?
+ & lang.attribute?
  & langto.attribute?
 glossary.type.attribute = attribute type { xsd:NCName }
-langfrom.attribute = attribute langfrom { xsd:language }
 langto.attribute = attribute langto { xsd:language }
 
 glossary.content =
@@ -393,10 +392,11 @@
    glossary.entry.attributes, glossary.entry.content }
 
 glossary.entry.attributes =
-   xmlid.attribute
+   xmlid.attribute?
 
 glossary.entry.content =
    mainterm,
+   alt-terms,
    media?,
    meanings+,
    seealso*
@@ -405,6 +405,15 @@
 mainterm = element mainterm { mainterm.content }
 mainterm.content = simple.inlines
 
+# ~~~~~~ alt-terms
+alt-terms = element alt-terms { alt-terms.content }
+alt-terms.content = alt-term+
+
+# ~~~~~~ alt-term
+alt-term = element alt-term { alt-terms.attributes, alt-term.content }
+alt-terms.attributes = type.attribute?
+alt-term.content = inlines
+
 # =============================================================================
 #                                 BLOCK LEVEL
 # =============================================================================