--- a/Xxe/Css/publidoc.css	jeu. janv. 05 20:10:05 2012 +0100
+++ b/Xxe/Css/publidoc.css	ven. janv. 06 00:45:13 2012 +0100
@@ -1,3 +1,5 @@
+@charset "UTF-8";
+
 /* $Id$ */
 
 *::comment { display: none; }
@@ -29,10 +31,8 @@
 head > subtitle:before { display: none; }
 head > identifier[type="uri"]:before { content: insert-before-button() " URI :"; }
 head > identifier[type="ean"]:before { content: insert-before-button() " EAN :"; }
-head > language:before { content: insert-before-button() " Langue :"; }
 head > copyright:before { content: insert-before-button() " Copyright :"; }
-head > author:before { content: insert-before-button() " Auteur :"; }
-head > publisher:before { content: insert-before-button() " Éditeur :"; }
+head > contributors:before { content: insert-before-button() " Contributeurs :"; }
 head > date:before { content: insert-before-button() " Date :"; }
 head > place:before { content: insert-before-button() " Lieu :"; }
 head > source:before { content: insert-before-button() " Source :"; }
@@ -44,8 +44,16 @@
 
 head > * {
  display: block;
- margin: 0 0 .5em 7em;
+ margin: 0 0 .8em 7.5em;
 }
+
+head > *:after {
+  color:  #7f7f7f;
+  content: " " insert-after-button();
+}
+
+/* title & subtitle ~~~~~~~~~~~~~~~~ */
+
 head > title {
   font-size: 120%;
   font-weight: bold;
@@ -58,39 +66,48 @@
   margin: 0 0 .2em 0;
 }
 
-head > *:after {
-  color:  #7f7f7f;
-  content: " " insert-after-button();
+/* contributors ~~~~~~~~~~~~~~~~~~~~ */
+
+contributor:before {
+  display: marker;
+  content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc))
+           insert-after-button(color, #7f7f7f, icon, icon(right-half-disc));
 }
-head > annotation:after { content: ""; }
-
-language {
-  content: combo-box(attribute, "xml:lang", font-size, 75%,
-             labels, "Anglais\A Français\A Français (France)\A Espagnol",
-             values, "en\A fr\A fr-FR\A, es");
+contributor {
+  display: block;
+  margin: 0 0 .2em 24px;
 }
 
-head lastname:before {
-  content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc));
-}
-lastname:after {
+firstname:after, secondname:after, lastname:after, label:after,
+address:after {
   content: insert-after-button(color, #7f7f7f, icon, icon(right-half-disc));
 }
 
-head role:before {
-  color: #7f7f7f;
-  content: " role : " label(attribute, of, color, black)
-           set-attribute-button(attribute, of);
+contributor > link[uri]:after {
+  content: " ‣ " text-field(attribute, uri, color, black, font-size, 80%) "]"
+           insert-after-button(icon, icon(right-half-disc));
+}
+contributor > link[idref]:after {
+  content: " ‣ " label(attribute, idref, color, black)
+           set-attribute-button(attribute, idref) "]"
+           insert-after-button(icon, icon(right-half-disc));
 }
 
-head > publisher > label:after {
-  content: insert-after-button(color, #7f7f7f, icon, icon(right-half-disc));
+head role {
+  color: #7f7f7f;
+  content: " role : " combo-box(element, "role", font-size, 75%,
+             labels, "auteur\A illustrateur\A éditeur"
+             values, "author\A illustrator\A publisher", color, black);;
 }
 
+/* source ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 head source[type="book"] {
   display: none;
 }
 
+/* keyword & subject ~~~~~~~~~~~~~~~ */
+
 head keyword:after {
   content: insert-same-after-button(color, #7f7f7f, icon, icon(right-half-disc))
            " ";
@@ -104,6 +121,11 @@
   content: insert-same-after-button(color, #7f7f7f, icon, icon(right-half-disc));
 }
 
+/* annotation ~~~~~~~~~~~~~~~~~~~~~~ */
+
+head > annotation:after { content: ""; }
+
+
 /* Division level ========================================================== */
 
 division:before {
@@ -189,19 +211,37 @@
   padding: 1.2em 5px 1em 5px;
 }
 publidoc > document:before {
-  content: "Document – "
-           "ID = " text-field(attribute, "xml:id", columns, 15, color, white);
+  content: add-attribute-button() " Document"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white);
+}
+publidoc > document[xml|id][xml|lang]:before {
+  content: "Document"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – Langue principale  = " combo-box(attribute, "xml:lang", font-size, 75%,
+             values, "en\A fr\A fr-FR\A es", color, white);
 }
 publidoc > topic[xml|id]:before {
-  content: add-attribute-button() " Topic – "
-           "ID = " text-field(attribute, "xml:id", columns, 15, color, white);
+  content: add-attribute-button() " Topic"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white);
 }
 publidoc > topic[xml|id][type]:before {
-  content: "Topic"
+  content: add-attribute-button() " Topic"
            " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
            " – Type = " text-field(attribute, type, columns, 10, color, white);
 }
-
+publidoc > topic[xml|id][xml|lang]:before {
+  content: add-attribute-button() " Topic"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – Langue principale  = " combo-box(attribute, "xml:lang", font-size, 75%,
+             values, "en\A fr\A fr-FR\A es", color, white);
+}
+publidoc > topic[xml|id][type][xml|lang]:before {
+  content: "Topic"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – Type = " text-field(attribute, type, columns, 10, color, white)
+           " – Langue principale  = " combo-box(attribute, "xml:lang", font-size, 75%,
+             values, "en\A fr\A fr-FR\A es", color, white);
+}
 
 publidoc > * {
   display: block;
@@ -290,7 +330,7 @@
   font-family: serif;
 }
 
-/* seepch ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* speech ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 speaker {
   font-weight: bold;