# HG changeset patch
# User Coraline MARKWITZ
# Date 1468402708 -7200
# Node ID 38cd9865036b61cf6139559ef67c5a5c50ebe487
# Parent  730c4c3055450841cae23fd50694839e205045d4
maj glossary

diff -r 730c4c305545 -r 38cd9865036b RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	mar. juil. 12 17:58:20 2016 +0200
+++ b/RelaxNG/publidoc.rnc	mer. juil. 13 11:38:28 2016 +0200
@@ -245,7 +245,6 @@
    ((section+, bibliography?) | bibliography),
    footer?
 
-
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ glossary ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 glossary = element glossary { glossary.attributes, glossary.content }
@@ -410,10 +409,12 @@
 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 = element alt-term { alt-term.attributes, alt-term.content }
+alt-term.attributes = alt-term.type.attribute?
 alt-term.content = inlines
 
+alt-term.type.attribute = attribute type { xsd:NCName }
+
 # =============================================================================
 #                                 BLOCK LEVEL
 # =============================================================================
@@ -770,14 +771,8 @@
 gramcode.attribute = attribute gramcode { xsd:NMTOKEN }
 
 meanings.content =
-   female?,
-   plural?,
    meaning+
 
-# ~~~~~~ female, plural
-female = element female { inlines }
-plural = element plural { inlines }
-
 # ~~~~~~ meaning
 meaning = element meaning { meaning.attributes, meaning.content }