# HG changeset patch # User Patrick PIERRE # Date 1317212951 -7200 # Node ID ae64c01c37f13dd8da66a1ca4e07205ef6f51cad # Parent 5be33d03941a62d4f527cd07064239fea4b80e63 Ajout de blockquote 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 } diff -r 5be33d03941a -r ae64c01c37f1 RelaxNG/publidoc.rng --- 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 @@ - - - - - - - - - author - illustrator - - - @@ -631,6 +618,7 @@ + @@ -739,6 +727,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 5be33d03941a -r ae64c01c37f1 Xml/Documents/torture_test.xml --- a/Xml/Documents/torture_test.xml mar. sept. 27 23:30:00 2011 +0200 +++ b/Xml/Documents/torture_test.xml mer. sept. 28 14:29:11 2011 +0200 @@ -215,6 +215,22 @@ + Les citations + +
+
+

Dans cent ans, qu'aimeriez-vous que l'on dise de vous ?

+

+ — J'aimerais que l'on dise : il se porte bien pour son + âge ! +

+ Woody ALLEN +
+
+ + + + Les tableaux