# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1379799713 -7200
# Node ID 3483da1b39eb251ee51fcbe844d525caf81b70f3
# Parent  9f81d8e6405d32639ff959ea4d15df9366ac262d
Rendu des nouvelles tables

diff -r 9f81d8e6405d -r 3483da1b39eb Xxe/Css/publidoc.css
--- a/Xxe/Css/publidoc.css	sam. sept. 21 23:18:37 2013 +0200
+++ b/Xxe/Css/publidoc.css	sam. sept. 21 23:41:53 2013 +0200
@@ -1,9 +1,9 @@
 @charset "UTF-8";
 
+@import url(xxe-config:common/css/cals_table.imp);
+
 /* $Id$ */
 
-@import url(xxe-config:common/css/cals_table.imp);
-
 *::comment { display: none; }
 
 publidoc {
@@ -317,9 +317,10 @@
   margin-left: 1em;
 }
 
-header, section, footer {
+header, front, section, footer {
   display: block;
 }
+
 section[type="box"] {
   margin-bottom: .5em;
   padding: 5px;
@@ -333,6 +334,14 @@
   background-color: #fafafa;
 }
 
+front {
+  margin: 1em 20px 1em 20px;
+  background-color: #fafafa;
+}
+front p {
+  font-family: sans-serif;
+}
+
 section section {
   margin-left: 1em;
 }
@@ -446,6 +455,55 @@
 
 attribution { font-style: italic; }
 
+/* table ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+@extension "com.xmlmind.xmleditext.xhtml.table.TableSupport black rgb(238,238,224)";
+
+table {
+  display: table;
+  border-style: solid;
+  border-width: 1px;
+  margin-top: 0;
+  margin-bottom: 1em;
+}
+
+table > head {
+  display: table-caption;
+  margin-left: 24px;
+  margin-bottom: 0;
+}
+
+table title {
+  font-size: 93%;
+  font-family: sans-serif;
+  color: black;
+}
+
+thead, tbody { 
+  display: table-row-group;
+}
+
+tr { 
+  display: table-row;
+}
+
+td, th {
+  display: table-cell;
+  border-style: solid;
+  border-width: 1px;
+  padding: .2em;
+}
+th {
+  font-weight: bold;
+}
+
+table > caption {
+  display: block;
+  font-family: sans-serif;
+  font-size: 93%;
+  color: #004080;
+}
+
 /* media ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 media {
diff -r 9f81d8e6405d -r 3483da1b39eb Xxe/publidoc.xxe
--- a/Xxe/publidoc.xxe	sam. sept. 21 23:18:37 2013 +0200
+++ b/Xxe/publidoc.xxe	sam. sept. 21 23:41:53 2013 +0200
@@ -22,27 +22,90 @@
     <menu label="Tableaux">
       <item label="Ligne – Insérer avant"
             icon="xxe-config:common/icons/insertRowBefore.png"
-            command="tableEdit" parameter="insertRowBefore"/>
+            command="xhtml.tableEdit" parameter="insertRowBefore"/>
       <item label="Ligne – Insérer après"
             icon="xxe-config:common/icons/insertRowAfter.png"
-            command="tableEdit" parameter="insertRowAfter"/>
+            command="xhtml.tableEdit" parameter="insertRowAfter"/>
+      <item label="Ligne – Couper"
+            icon="xxe-config:common/icons/cut.png"
+            command="xhtml.tableEdit" parameter="cutRow"/>
+      <item label="Ligne – Copier"
+            icon="xxe-config:common/icons/copy.png"
+            command="xhtml.tableEdit" parameter="copyRow"/>
+      <item label="Ligne – Coller avant"
+            icon="xxe-config:common/icons/pasteBefore.png"
+            command="xhtml.tableEdit" parameter="pasteRowBefore"/>
+      <item label="Ligne – Coller après"
+            icon="xxe-config:common/icons/pasteAfter.png"
+            command="xhtml.tableEdit" parameter="pasteRowAfter"/>
       <item label="Ligne – Supprimer"
             icon="xxe-config:common/icons/deleteRow.png"
-            command="tableEdit" parameter="deleteRow"/>
+            command="xhtml.tableEdit" parameter="deleteRow"/>
       <separator />
       <item label="Colonne – Insérer avant"
             icon="xxe-config:common/icons/insertColumnBefore.png"
-            command="tableEdit" parameter="insertColumnBefore"/>
+            command="xhtml.tableEdit" parameter="insertColumnBefore"/>
       <item label="Colonne – Insérer après"
             icon="xxe-config:common/icons/insertColumnAfter.png"
-            command="tableEdit" parameter="insertColumnAfter"/>
+            command="xhtml.tableEdit" parameter="insertColumnAfter"/>
+      <item label="Colonne – Couper"
+            icon="xxe-config:common/icons/cut.png"
+            command="xhtml.tableEdit" parameter="cutColumn"/>
+      <item label="Colonne – Copier"
+            icon="xxe-config:common/icons/copy.png"
+            command="xhtml.tableEdit" parameter="copyColumn"/>
+      <item label="Colonne – Coller avant"
+            icon="xxe-config:common/icons/pasteBefore.png"
+            command="xhtml.tableEdit" parameter="pasteColumnBefore"/>
+      <item label="Colonne – Coller après"
+            icon="xxe-config:common/icons/pasteAfter.png"
+            command="xhtml.tableEdit" parameter="pasteColumnAfter"/>
       <item label="Colonne – Supprimer"
             icon="xxe-config:common/icons/deleteColumn.png"
-            command="tableEdit" parameter="deleteColumn"/>
+            command="xhtml.tableEdit" parameter="deleteColumn"/>
+      <separator />
+      <item label="Cellule – Incrémenter l'extension horizontale"
+            icon="xxe-config:common/icons/incrementColumnSpan.png"
+            command="xhtml.tableEdit" parameter="incrColumnSpan"/>
+      <item label="Cellule –Décrémenter l'extension horizontale"
+            icon="xxe-config:common/icons/decrementColumnSpan.png"
+            command="xhtml.tableEdit" parameter="decrColumnSpan"/>
+      <item label="Cellule –Incrémenter l'extension verticale"
+            icon="xxe-config:common/icons/incrementRowSpan.png"
+            command="xhtml.tableEdit" parameter="incrRowSpan"/>
+      <item label="Cellule –Décrémenter l'extension verticale"
+            icon="xxe-config:common/icons/decrementRowSpan.png"
+            command="xhtml.tableEdit" parameter="decrRowSpan"/>
+    </menu>
+
+    <menu label="Tableaux CALS">
+      <item label="Ligne – Insérer avant"
+            icon="xxe-config:common/icons/insertRowBefore.png"
+            command="cals.tableEdit" parameter="insertRowBefore"/>
+      <item label="Ligne – Insérer après"
+            icon="xxe-config:common/icons/insertRowAfter.png"
+            command="cals.tableEdit" parameter="insertRowAfter"/>
+      <item label="Ligne – Supprimer"
+            icon="xxe-config:common/icons/deleteRow.png"
+            command="cals.tableEdit" parameter="deleteRow"/>
+      <separator />
+      <item label="Colonne – Insérer avant"
+            icon="xxe-config:common/icons/insertColumnBefore.png"
+            command="cals.tableEdit" parameter="insertColumnBefore"/>
+      <item label="Colonne – Insérer après"
+            icon="xxe-config:common/icons/insertColumnAfter.png"
+            command="cals.tableEdit" parameter="insertColumnAfter"/>
+      <item label="Colonne – Supprimer"
+            icon="xxe-config:common/icons/deleteColumn.png"
+            command="cals.tableEdit" parameter="deleteColumn"/>
     </menu>
   </menu>
   
-  <command name="tableEdit">
+  <command name="xhtml.tableEdit">
+    <class>com.xmlmind.xmleditext.xhtml.table.HTMLTableEdit</class>
+  </command>
+
+  <command name="cals.tableEdit">
     <class>com.xmlmind.xmleditext.docbook.table.CALSTableEdit</class>
   </command>