# HG changeset patch # User Patrick PIERRE # Date 1353745272 -3600 # Node ID aba988da5d5061403a26e22edf07feafea0f508e # Parent d8fab077a6dcbc4706bdbc8171373650308db22b Amélioration de la gestion des tableaux diff -r d8fab077a6dc -r aba988da5d50 RelaxNG/Examples/Documents/torture_test.xml --- a/RelaxNG/Examples/Documents/torture_test.xml mar. nov. 20 14:50:34 2012 +0100 +++ b/RelaxNG/Examples/Documents/torture_test.xml sam. nov. 24 09:21:12 2012 +0100 @@ -393,39 +393,92 @@
- Un tableau simple + Grades de la Marine nationale - Head 1 - Head 2 - Head 3 + Grade d'officier supérieur + Appellation + Surnom - - - Foot 1 - Foot 2 - Foot 3 - - - Cell 1.1 - Cell 1.2 - Cell 1.3 + Capitaine de vaisseau + Commandant + Cap de veau - Cell 2.1 - Cell 2.2 - Cell 2.3 + Capitaine de frégate + Commandant + Frégaton + + + Capitaine de corvette + Commandant + Corvetard - + + + + Grade d'officier subalterne + Appellation + Surnom + + + + + Lieutenant de vaisseau + Capitaine + Loufiat + + + Enseigne de vaisseau première classe + Lieutenant + + + + Enseigne de vaisseau deuxième classe + Lieutenant + + + + Aspirant + Lieutenant + Midship + + + + + + + Grade d'officier marinier + Appellation + Surnom + + + + + Major + Major + + + + Maître principal + Maître principal + Cipal + + + Premier maître + Premier maître + Patron ou Pé M + + + +
-

Légende du tableau

- Extrait de la nomenclature officielle
diff -r d8fab077a6dc -r aba988da5d50 RelaxNG/publidoc.rnc --- 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