# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1324492837 -3600
# Node ID 2cb99a0b3709c389db64800cf6c4bef6cfe8d41c
# Parent  0a73f33693126d9ec0bdcbfeb49baf6bda307d88
Amélioration des sections

diff -r 0a73f3369312 -r 2cb99a0b3709 Xxe/publidoc.css
--- a/Xxe/publidoc.css	mer. déc. 21 16:42:54 2011 +0100
+++ b/Xxe/publidoc.css	mer. déc. 21 19:40:37 2011 +0100
@@ -14,7 +14,7 @@
 head {
   display: block; 
   margin-bottom: .5em;
-  background-color: #ffffee;
+  background-color: #fafafa;
   padding: 0 .2em 0 .2em;
   border: 1px solid #bbbbbb;
   border-radius: 0.2em;
@@ -27,7 +27,8 @@
 }
 head > title:before { display: none; }
 head > subtitle:before { content: "Sous-titre :"; }
-head > identifier:before { content: insert-before-button() " Identifiant :"; }
+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 :"; }
@@ -61,6 +62,11 @@
 }
 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");
+}
 
 /* Division level ========================================================== */
 
@@ -83,6 +89,7 @@
 }
 
 division > head {
+  background-color: #ffffee;
   padding: .3em .5em .3em .5em;
   border-radius: 0.5em;
 }
@@ -101,20 +108,19 @@
 }
 topic[xml|id]:before {
   content: collapser() " " insert-before-button() insert-after-button()
-           " " add-attribute-button() " Topic – "
-           " ID = " text-field(attribute, "xml:id", columns, 15, color, black);
+           " " add-attribute-button() " Topic"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, black);
 }
 topic[type]:before {
   content: collapser() " " insert-before-button() insert-after-button()
-           " " add-attribute-button() " Topic – "
-           " Type = " text-field(attribute, type, columns, 10, color, black);
+           " " add-attribute-button() " Topic"
+           " – Type = " text-field(attribute, type, columns, 10, color, black);
 }
 topic[xml|id][type]:before {
   content: collapser() " " insert-before-button() insert-after-button()
-           " Topic – "
-           " ID = " text-field(attribute, "xml:id", columns, 15, color, black)
-           "  " icon(diamond)
-           " Type = " text-field(attribute, type, columns, 10, color, black);
+           " Topic"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, black)
+           " – Type = " text-field(attribute, type, columns, 10, color, black);
 }
 
 topic {
@@ -129,6 +135,7 @@
 }
 
 topic > head {
+  background-color: #ffffee;
   padding: .3em .5em .3em .5em;
   border-radius: 0.5em;
 }
@@ -136,14 +143,12 @@
 
 /* Top level =============================================================== */
 
-/* Topic ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
 publidoc > *:before {
   display: block;
   color: #bbbbbb;
-  background-color: #993333;
+  background: #993333 url('top.png') repeat-x top left;
   font-weight: bold;
-  padding: 1em 5px 1em 5px;
+  padding: 1.2em 5px 1em 5px;
 }
 publidoc > document:before {
   content: "Document – "
@@ -154,24 +159,21 @@
            "ID = " text-field(attribute, "xml:id", columns, 15, color, white);
 }
 publidoc > topic[xml|id][type]:before {
-  content: "Topic – "
-           " ID = " text-field(attribute, "xml:id", columns, 15, color, white)
-           "  " icon(diamond)
-           " Type = " text-field(attribute, type, columns, 10, color, white);
+  content: "Topic"
+           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – Type = " text-field(attribute, type, columns, 10, color, white);
 }
 
 
 publidoc > * {
   display: block; 
   margin: 5px;
-}
-
-publidoc > topic {
+  padding: 0;
   border: 0;
-  padding: 0;
 }
 
 publidoc > * > head {
+  background-color: #ffffee;
   padding: .3em .5em .3em .5em;
   border-radius: 0.5em;
 }
@@ -179,26 +181,58 @@
 
 /* Section level =========================================================== */
 
+section:before {
+  color: #7f7f7f;
+  content: insert-before-button() insert-button()
+           add-attribute-button(icon, icon(plus-box));
+}
+section[type]:before {
+  content: insert-before-button() insert-button()
+           text(" Type = ", font-size, 75%)
+           text-field(attribute, type, columns, 10, color, black, font-size, 75%);
+}
+
 section {
   display: block;
-  margin-bottom: .5em;
 }
-section:last-child {
-  margin-bottom: 0;
+section[type="box"] {
+  margin: .5em 0 .5em 0;
+  padding: 5px;
+  background-color: #e8f0f7;
+  border-radius: 0.2em;
+}
+section[type="sign"] { text-align: right; }
+
+section section {
+  margin-left: 1em;  
+}
+
+section:after {
+  color: #7f7f7f;
+  content: insert-after-button();
 }
 
 
 /* Block level ============================================================= */
 
-p, speech, blockquote, table, media {
+p:before, speech:before, list:before,
+blockquote:before, table:before, media:before {
+  display: marker;  
+  content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc))
+           insert-after-button(color, #7f7f7f, icon, icon(right-half-disc));
+}
+
+p, speech, list, blockquote, table, media {
   display: block;
+  margin-left: 24px;
+  font-size: 110%;
+  font-family: serif;
 }
 
 /* List ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 list {
-  display: block;
-  margin: .3em 0 .3em 0;
+  margin: .3em 0 .3em 24px;
 }
 
 item {
@@ -212,11 +246,19 @@
   font-weight: bold;
 }
 
-item > p {
-    
-}
+/* Blockquote ~~~~~~~~~~~~~~~~~~~~~~ */
+
+attribution { font-style: italic; }
+
 
 /* Inline level ============================================================ */
 
 sup { vertical-align: super; font-size: 75%; }
 sub { vertical-align: sub;   font-size: 75%; }
+
+note:before { content: "("; }
+note { color: #7f7f7f; font-size: 85%; font-family: sans-serif; }
+note:after { content: ")"; }
+note p { display:inline; }
+
+highlight { font-weight: bold; }
diff -r 0a73f3369312 -r 2cb99a0b3709 Xxe/publidoc.xxe_addon
--- a/Xxe/publidoc.xxe_addon	mer. déc. 21 16:42:54 2011 +0100
+++ b/Xxe/publidoc.xxe_addon	mer. déc. 21 19:40:37 2011 +0100
@@ -13,6 +13,6 @@
 
   <a:author><a href="http://www.prismallia.fr">Prismallia</a></a:author>
 
-  <a:xxeVersion>5.0.0</a:xxeVersion>
+  <a:xxeVersion>5.1.0+</a:xxeVersion>
 
 </a:addon>
diff -r 0a73f3369312 -r 2cb99a0b3709 Xxe/top.png
Binary file Xxe/top.png has changed