diff -r 0c7725713208 -r 2b32b535705c RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc sam. juin 11 00:33:24 2011 +0200 +++ b/RelaxNG/publidoc.rnc sam. juin 11 01:26:31 2011 +0200 @@ -218,7 +218,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blocks ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -block = (parag | \list | media | speech) +block = (parag | \list | speech | media) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ parag ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -235,8 +235,8 @@ \list.content = title?, - ( (attribute type {"ordered"} ?, item, item+) - | (attribute type {"itemized"}, item, item+) + ( (attribute type {"itemized"} ?, item, item+) + | (attribute type {"ordered"}, item, item+) | (attribute type {"glossary"}, glossary.item+) ) # ~~~~~~ item @@ -256,6 +256,26 @@ label.content = inlines +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ speech ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# ~~~~~~ speech +speech = element speech { speech.content } + +speech.content = + speaker?, + stage?, + parag+ + +# ~~~~~~ speaker +speaker = element speaker { speaker.content } + +speaker.content = inlines + +# ~~~~~~ stage +stage = element stage { stage.content } + +stage.content = inlines + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ media ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~ media @@ -288,27 +308,6 @@ copyright.content = inlines -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ speech ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# ~~~~~~ speech -speech = element speech { speech.content } - -speech.content = - speaker?, - stage?, - parag+ - -# ~~~~~~ speaker -speaker = element speaker { speaker.content } - -speaker.content = inlines - -# ~~~~~~ stage -stage = element stage { stage.content } - -stage.content = inlines - - # ============================================================================= # Inline level # =============================================================================