--- a/RelaxNG/publidoc.rnc dim. avril 09 09:36:40 2017 +0200
+++ b/RelaxNG/publidoc.rnc dim. avril 09 13:24:52 2017 +0200
@@ -245,7 +245,7 @@
((section+, bibliography?) | bibliography),
footer?
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ glossary ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ glossary ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
glossary = element glossary { glossary.attributes, glossary.content }
@@ -386,6 +386,7 @@
block+
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ glossary.entry ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
# ~~~~~~ glossary.entry
glossary.entry= element entry {
glossary.entry.attributes, glossary.entry.content }
@@ -402,19 +403,25 @@
# ~~~~~~ mainterm
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-terms.content =
+ alt-term+
# ~~~~~~ alt-term
alt-term = element alt-term { alt-term.attributes, alt-term.content }
-alt-term.attributes = alt-term.type.attribute?
+
alt-term.content = inlines
+alt-term.attributes =
+ alt-term.type.attribute?
alt-term.type.attribute = attribute type { xsd:NCName }
+
# =============================================================================
# BLOCK LEVEL
# =============================================================================
@@ -855,7 +862,7 @@
& image*
& audio*
& smil*
-
+
& nowrap*
}
@@ -920,7 +927,7 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ example ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
example = element example { example.content }
-
+
example.content = inlines
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ stage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~