diff -r 68fd62d59f7c -r 2a8ac62f00d3 RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc lun. mars 18 14:54:24 2013 +0100 +++ b/RelaxNG/publidoc.rnc jeu. mars 21 12:31:59 2013 +0100 @@ -215,11 +215,6 @@ speaker.content = inlines -# ~~~~~~ stage -stage = element stage { stage.content } - -stage.content = inlines - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~ list @@ -603,10 +598,11 @@ & acronym* & mentioned* & term* + & stage* & literal* + & initial* & link* & anchor* - & initial* & image* & smil* } @@ -727,12 +723,28 @@ term.content = inlines +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ stage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +stage = element stage { stage.content } + +stage.content = inlines + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ literal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ literal = element literal { literal.content } literal.content = text +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ initial ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +initial = element initial { initial.content } + +initial.content = + c, + w? + +c = element c { text } + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link = element link { link.attributes, link.content } @@ -754,16 +766,6 @@ anchor.content = inlines -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ initial ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -initial = element initial { initial.content } - -initial.content = - c, - w? - -c = element c { text } - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ smil ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ smil = element smil { smil.attributes, smil.content }