--- a/Xxe/Css/publiquiz.css	ven. févr. 01 19:21:20 2013 +0100
+++ b/Xxe/Css/publiquiz.css	dim. févr. 03 19:22:41 2013 +0100
@@ -261,7 +261,14 @@
 /* composite ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 composite:before {
-  content: insert-before-button() " Composite";
+  content: insert-before-button()
+           command-button(command, "putAttribute", parameter, "multipage true", icon, icon(plus-box))
+           " Composite";
+}
+composite[multipage]:before {
+  content: insert-before-button()
+           " Composite – multipage = " label(attribute, multipage, color, black)
+           set-attribute-button(attribute, multipage, unset-attribute, yes)
 }
 
 subquiz {
@@ -316,6 +323,13 @@
 
 /* Block level ============================================================= */
 
+/* image ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+right image, wrong image, item image {
+  content: concatenate("image('Images/", attr(id), ".png', -128, -96, smooth)");
+  vertical-align: middle;
+}
+
 /* choices.right, choices.wrong ~~~~ */
 
 choices-radio right:before, choices-radio wrong:before,
@@ -407,21 +421,22 @@
 match {
   display: block;
   margin-left: 24px;
+  margin-bottom: .8em;
 }
 
-match > section:before, match > p:before {
+match > item:before {
   display: none;
 }
 
-match section, match p {
+match item {
   display: inline;
 }
 
-match > section:first-child:after, match > p:first-child:after {
+match > item:first-child:after {
   color: #7f7f7f;
   content: " —>  ";
 }
-match > section:last-child:after, match > p:last-child:after {
+match > item:last-child:after {
   display: none;
 }
 
@@ -472,6 +487,7 @@
 
 category > item {
   margin-left: 1em;
+  margin-bottom: 0.8em;
 }
 
 category:after {