--- a/RelaxNG/publidoc.rng sam. juin 11 00:33:24 2011 +0200
+++ b/RelaxNG/publidoc.rng sam. juin 11 01:26:31 2011 +0200
@@ -405,8 +405,8 @@
<choice>
<ref name="parag"/>
<ref name="list"/>
+ <ref name="speech"/>
<ref name="media"/>
- <ref name="speech"/>
</choice>
</define>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ parag ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
@@ -438,7 +438,7 @@
<group>
<optional>
<attribute name="type">
- <value>ordered</value>
+ <value>itemized</value>
</attribute>
</optional>
<ref name="item"/>
@@ -448,7 +448,7 @@
</group>
<group>
<attribute name="type">
- <value>itemized</value>
+ <value>ordered</value>
</attribute>
<ref name="item"/>
<oneOrMore>
@@ -497,6 +497,42 @@
<define name="label.content">
<ref name="inlines"/>
</define>
+ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ speech ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- ~~~~~~ speech -->
+ <define name="speech">
+ <element name="speech">
+ <ref name="speech.content"/>
+ </element>
+ </define>
+ <define name="speech.content">
+ <optional>
+ <ref name="speaker"/>
+ </optional>
+ <optional>
+ <ref name="stage"/>
+ </optional>
+ <oneOrMore>
+ <ref name="parag"/>
+ </oneOrMore>
+ </define>
+ <!-- ~~~~~~ speaker -->
+ <define name="speaker">
+ <element name="speaker">
+ <ref name="speaker.content"/>
+ </element>
+ </define>
+ <define name="speaker.content">
+ <ref name="inlines"/>
+ </define>
+ <!-- ~~~~~~ stage -->
+ <define name="stage">
+ <element name="stage">
+ <ref name="stage.content"/>
+ </element>
+ </define>
+ <define name="stage.content">
+ <ref name="inlines"/>
+ </define>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ media ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- ~~~~~~ media -->
<define name="media">
@@ -552,42 +588,6 @@
<define name="copyright.content">
<ref name="inlines"/>
</define>
- <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ speech ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <!-- ~~~~~~ speech -->
- <define name="speech">
- <element name="speech">
- <ref name="speech.content"/>
- </element>
- </define>
- <define name="speech.content">
- <optional>
- <ref name="speaker"/>
- </optional>
- <optional>
- <ref name="stage"/>
- </optional>
- <oneOrMore>
- <ref name="parag"/>
- </oneOrMore>
- </define>
- <!-- ~~~~~~ speaker -->
- <define name="speaker">
- <element name="speaker">
- <ref name="speaker.content"/>
- </element>
- </define>
- <define name="speaker.content">
- <ref name="inlines"/>
- </define>
- <!-- ~~~~~~ stage -->
- <define name="stage">
- <element name="stage">
- <ref name="stage.content"/>
- </element>
- </define>
- <define name="stage.content">
- <ref name="inlines"/>
- </define>
<!--
=============================================================================
Inline level