--- a/RelaxNG/publidoc.rnc mar. nov. 20 14:50:34 2012 +0100
+++ b/RelaxNG/publidoc.rnc sam. nov. 24 09:21:12 2012 +0100
@@ -269,7 +269,6 @@
tgroup.content =
thead?,
- tfoot?,
tbody
tgroup.attributes =
@@ -282,37 +281,39 @@
colsep.attribute = attribute colsep { "0" | "1" }
rowsep.attribute = attribute rowsep { "0" | "1" }
-# ~~~~~~ thead, tfoot, tbody
+# ~~~~~~ thead, tbody
thead = element thead { thead.attributes, thead.content }
-tfoot = element tfoot { tfoot.attributes, tfoot.content }
tbody = element tbody { tbody.attributes, tbody.content }
thead.attributes =
valign.attribute?
-tfoot.attributes =
- valign.attribute?
tbody.attributes =
valign.attribute?
valign.attribute = attribute valign { "top" | "middle" | "bottom" }
thead.content =
row+
-tfoot.content =
- row+
tbody.content =
row+
# ~~~~~~ row
-row = element row { row.attribute, row.content }
+row = element row { row.attributes, row.content }
-row.attribute =
+row.attributes =
valign.attribute?
+ & rowsep.attribute?
row.content =
entry+
# ~~~~~~ entry
-entry = element entry { entry.content }
+entry = element entry { entry.attributes, entry.content }
+
+entry.attributes =
+ align.attribute?
+ & valign.attribute?
+ & colsep.attribute?
+ & rowsep.attribute?
entry.content =
inlines