# HG changeset patch # User Patrick PIERRE # Date 1379756667 -7200 # Node ID 88251c3ce4a90c767e5beac783f2b473c88ab143 # Parent b62d4097845e5fe08701e6644e7e8984b65f3f54 Nouvelles tables diff -r b62d4097845e -r 88251c3ce4a9 RelaxNG/Examples/Documents/torture_test.xml --- a/RelaxNG/Examples/Documents/torture_test.xml sam. sept. 21 11:32:02 2013 +0200 +++ b/RelaxNG/Examples/Documents/torture_test.xml sam. sept. 21 11:44:27 2013 +0200 @@ -506,16 +506,93 @@ Les tableaux
+ + Tableau standard + + + + Consonnes sonores et sourdes en russe + + +
Consonnes sonoresConsonnes sourdes
г, б, з, д, в, жк, п, с, т, ф, ш
+ + + Journal de navigation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  +

Avion :

Horamètre :

+
+

Autonomie :

Heure :

+
 RmD (NM)He, Hr/Tsv (min)RadioVORAlt. (ft)Zone…
Chavenay  Tour : 129,525   
 220°8+5  max : 2000 
Étangs de Hollande      
 155°23+14  max : 2500 
Étampes  

Tour : 119,05

   
+

ATIS

+

QNH

QFU

Visi.

Vent

+ 		+

ATIS

+

QNH

QFU

Visi.

Vent

+
Archive P²
+
+ +
+ + Tableau CALS + Grades de la Marine nationale - + - Grade d'officier supérieur + Grade d'officier supérieur Appellation - Surnom + Surnom @@ -539,9 +616,9 @@ - Grade d'officier subalterne - Appellation - Surnom + Grade d'officier subalterne + Appellation + Surnom @@ -570,9 +647,9 @@ - Grade d'officier marinier - Appellation - Surnom + Grade d'officier marinier + Appellation + Surnom diff -r b62d4097845e -r 88251c3ce4a9 RelaxNG/publiquiz.rnc --- a/RelaxNG/publiquiz.rnc sam. sept. 21 11:32:02 2013 +0200 +++ b/RelaxNG/publiquiz.rnc sam. sept. 21 11:44:27 2013 +0200 @@ -316,63 +316,55 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -blanks.table = element table { blanks.table.content } -point.table = element table { point.table.content } +blanks.table = element table { table.attributes, blanks.table.content } +point.table = element table { table.attributes, point.table.content } blanks.table.content = block.head?, - blanks.tgroup+, + thead?, + (blanks.tbody+ | blanks.tr+), table.caption? point.table.content = block.head?, - point.tgroup+, + (point.tbody+ | point.tr+), table.caption? -# ~~~~~~ tgroup -blanks.tgroup = element tgroup { tgroup.attributes, blanks.tgroup.content } -point.tgroup = element tgroup { tgroup.attributes, point.tgroup.content } - -blanks.tgroup.content = - thead?, - blanks.tbody -point.tgroup.content = - thead?, - point.tbody - # ~~~~~~ tbody -blanks.tbody = element tbody { tbody.attributes, blanks.tbody.content } -point.tbody = element tbody { tbody.attributes, point.tbody.content } +blanks.tbody = element tbody { blanks.tbody.content } +point.tbody = element tbody { point.tbody.content } blanks.tbody.content = - blanks.row+ + blanks.tr+ point.tbody.content = - point.row+ + point.tr+ -# ~~~~~~ row -blanks.row = element row { row.attributes, blanks.row.content } -point.row = element row { row.attributes, point.row.content } +# ~~~~~~ tr +blanks.tr = element tr { tr.attributes, blanks.tr.content } +point.tr = element tr { tr.attributes, point.tr.content } -blanks.row.content = - blanks.entry+ -point.row.content = - point.entry+ +blanks.tr.content = + (blanks.td | blanks.th)+ +point.tr.content = + (point.td | point.th)+ -# ~~~~~~ entry -blanks.entry = element entry { blanks.entry.content } -point.entry = element entry { point.entry.content } +# ~~~~~~ td, th +blanks.td = element td { td.attributes, blanks.td.content } +blanks.th = element th { td.attributes, blanks.td.content } +point.td = element td { td.attributes, point.td.content } +point.th = element th { td.attributes, point.td.content } -blanks.entry.content = +blanks.td.content = blanks.inlines | (p | media)+ -point.entry.content = +point.td.content = point.inlines | (p | media)+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ media ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~ blanks.media -blanks.media = element media { blanksmedia.content } +blanks.media = element media { media.attributes, blanksmedia.content } blanksmedia.content = block.head?,