diff -r 5be33d03941a -r ae64c01c37f1 RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc mar. sept. 27 23:30:00 2011 +0200 +++ b/RelaxNG/publidoc.rnc mer. sept. 28 14:29:11 2011 +0200 @@ -131,10 +131,6 @@ # ~~~~~~ author author = element author { author.content } -author.attributes = - role.attribute? -role.attribute = attribute role { "author" | "illustrator" } - author.content = firstname?, lastname, @@ -304,7 +300,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ block ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -block = (p | speech | \list | table | media) +block = (p | speech | \list | blockquote | table | media) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -357,6 +353,22 @@ label, block+ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blockquote ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# ~~~~~~ blockquote +blockquote = element blockquote { blockquote.content } + +blockquote.content = + block.head?, + (p | speech | \list)+, + attribution? + +# ~~~~~~ attribution +attribution = element attribution { attribtuion.content } + +attribtuion.content = + inlines + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table = element table { table.content }