--- 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
# =============================================================================