--- a/RelaxNG/publidoc.rng mar. sept. 27 23:30:00 2011 +0200
+++ b/RelaxNG/publidoc.rng mer. sept. 28 14:29:11 2011 +0200
@@ -304,19 +304,6 @@
<ref name="author.content"/>
</element>
</define>
- <define name="author.attributes">
- <optional>
- <ref name="role.attribute"/>
- </optional>
- </define>
- <define name="role.attribute">
- <attribute name="role">
- <choice>
- <value>author</value>
- <value>illustrator</value>
- </choice>
- </attribute>
- </define>
<define name="author.content">
<optional>
<ref name="firstname"/>
@@ -631,6 +618,7 @@
<ref name="p"/>
<ref name="speech"/>
<ref name="list"/>
+ <ref name="blockquote"/>
<ref name="table"/>
<ref name="media"/>
</choice>
@@ -739,6 +727,37 @@
<ref name="block"/>
</oneOrMore>
</define>
+ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blockquote ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- ~~~~~~ blockquote -->
+ <define name="blockquote">
+ <element name="blockquote">
+ <ref name="blockquote.content"/>
+ </element>
+ </define>
+ <define name="blockquote.content">
+ <optional>
+ <ref name="block.head"/>
+ </optional>
+ <oneOrMore>
+ <choice>
+ <ref name="p"/>
+ <ref name="speech"/>
+ <ref name="list"/>
+ </choice>
+ </oneOrMore>
+ <optional>
+ <ref name="attribution"/>
+ </optional>
+ </define>
+ <!-- ~~~~~~ attribution -->
+ <define name="attribution">
+ <element name="attribution">
+ <ref name="attribtuion.content"/>
+ </element>
+ </define>
+ <define name="attribtuion.content">
+ <ref name="inlines"/>
+ </define>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<define name="table">
<element name="table">