Index: tmp/org.txm.cooccurrence.rcp/plugin.xml
===================================================================
--- tmp/org.txm.cooccurrence.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.cooccurrence.rcp/plugin.xml	(revision 698)
@@ -33,7 +33,7 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.concordance.rcp.handlers.ComputeConcordance">
          <command
                commandId="org.txm.cooccurrence.rcp.handlers.ComputeCooccurrences"
                icon="icons/cooccurrences.png"
@@ -52,7 +52,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=org.txm.concordance.rcp.handlers.ComputeConcordance">
          <command
                commandId="org.txm.cooccurrence.rcp.handlers.ComputeCooccurrences"
                icon="icons/cooccurrences.png"
Index: tmp/org.txm.progression.rcp/plugin.xml
===================================================================
--- tmp/org.txm.progression.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.progression.rcp/plugin.xml	(revision 698)
@@ -57,7 +57,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=org.txm.cooccurrence.rcp.handlers.ComputeCooccurrences">
          <command
                commandId="org.txm.progression.rcp.handlers.ComputeProgression"
                icon="icons/functions/progression.png"
@@ -72,6 +72,24 @@
             </visibleWhen>
          </command>
       </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.cooccurrence.rcp.handlers.ComputeCooccurrences">
+         <command
+               commandId="org.txm.progression.rcp.handlers.ComputeProgression"
+               icon="icons/functions/progression.png"
+               style="push"
+               tooltip="%command.tooltip">
+            <visibleWhen
+                  checkEnabled="false">
+               <or>
+                  <reference
+                        definitionId="OneCorpusSelected">
+                  </reference>
+               </or>
+            </visibleWhen>
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.txm.chartsengine.eventcallback">
Index: tmp/org.txm.concordance.rcp/plugin.xml
===================================================================
--- tmp/org.txm.concordance.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.concordance.rcp/plugin.xml	(revision 698)
@@ -34,7 +34,7 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.tools">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.index.rcp.handlers.ComputeIndex">
          <command
                commandId="org.txm.concordance.rcp.handlers.ComputeConcordance"
                icon="icons/concordance.png"
@@ -50,7 +50,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=org.txm.index.rcp.handlers.ComputeIndex">
          <command
                commandId="org.txm.concordance.rcp.handlers.ComputeConcordance"
                icon="icons/concordance.png"
Index: tmp/org.txm.synopticeditor.rcp/plugin.xml
===================================================================
--- tmp/org.txm.synopticeditor.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.synopticeditor.rcp/plugin.xml	(revision 698)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="org.txm.synopticeditor.toolbarbutton" name="Synoptic Editor toolbar button" schema="schema/org.txm.synopticeditor.toolbarbutton.exsd"/>
+   <extension-point id="org.txm.synopticedition.rcp.editors.ext.ToolbarButton" name="Synoptic Editor toolbar button" schema="schema/org.txm.synopticedition.rcp.editors.ext.ToolbarButton.exsd"/>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
@@ -44,7 +44,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?before=corporaview.description">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.read">
          <command
                commandId="org.txm.synopticedition.rcp.handlers.OpenEdition"
                icon="icons/objects/edition.png"
@@ -61,7 +61,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.corpus?before=menu.corpus.description">
+            locationURI="menu:menu.corpus?after=menu.corpus.read">
          <command
                commandId="org.txm.synopticedition.rcp.handlers.OpenEdition"
                icon="icons/objects/edition.png"
Index: tmp/org.txm.synopticeditor.rcp/schema/org.txm.synopticeditor.toolbarbutton.exsd
===================================================================
--- tmp/org.txm.synopticeditor.rcp/schema/org.txm.synopticeditor.toolbarbutton.exsd	(revision 697)
+++ tmp/org.txm.synopticeditor.rcp/schema/org.txm.synopticeditor.toolbarbutton.exsd	(revision 698)
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="SynopticEditorRCP" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="SynopticEditorRCP" id="org.txm.synopticeditor.bottombutton" name="Synoptic Editor bottom button"/>
-      </appinfo>
-      <documentation>
-         Add a button in the SynapticEditor bottom toolbar
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <choice minOccurs="1" maxOccurs="unbounded">
-            <element ref="Button"/>
-         </choice>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Button">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="org.txm.synopticedition.rcp.editors.ext.ToolbarButton:"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         TXM 0.7.8
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
Index: tmp/org.txm.synopticeditor.rcp/schema/org.txm.synopticedition.rcp.editors.ext.ToolbarButton.exsd
===================================================================
--- tmp/org.txm.synopticeditor.rcp/schema/org.txm.synopticedition.rcp.editors.ext.ToolbarButton.exsd	(revision 0)
+++ tmp/org.txm.synopticeditor.rcp/schema/org.txm.synopticedition.rcp.editors.ext.ToolbarButton.exsd	(revision 698)
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="SynopticEditorRCP" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="SynopticEditorRCP" id="org.txm.synopticedition.rcp.editors.ext.ToolbarButton" name="Synoptic Editor bottom button"/>
+      </appinfo>
+      <documentation>
+         Add a button in the SynapticEditor bottom toolbar
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice minOccurs="1" maxOccurs="unbounded">
+            <element ref="Button"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="Button">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.txm.synopticedition.rcp.editors.ext.ToolbarButton:"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         TXM 0.7.8
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>

Property changes on: tmp/org.txm.synopticeditor.rcp/schema/org.txm.synopticedition.rcp.editors.ext.ToolbarButton.exsd
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/ParaBrowserEditor.java
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/ParaBrowserEditor.java	(revision 697)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/ParaBrowserEditor.java	(revision 698)
@@ -135,7 +135,7 @@
 	/** The selected view properties. */
 	private List<StructuralUnit> selectedViewProperties;
 	
-	private ParaBrowser paraBrowser = new ParaBrowser();
+	private ParaBrowser paraBrowser;
 	
 	/** The next. */
 	private Button next;
@@ -465,8 +465,8 @@
 				structuralUnits = selectedViewCorpus.get(0)
 						.getOrderedStructuralUnits();
 			} catch (CqiClientException e) {
-				System.err
-						.println(TXMUIMessages.ObjectExplorer_9);
+				System.out.println("Error: "+e);
+				e.printStackTrace();
 				return;
 			}
 		}
@@ -731,7 +731,7 @@
 	 */
 	public void setReferencePattern(ReferencePattern referencePattern) {
 		this.referencePattern = referencePattern;
-		selectedReference = TXMUIMessages.ObjectExplorer_9;
+		selectedReference = ""; ////$NON-NLS-0$
 		if (referencePattern != null) {
 			// selectedStructuralUnit.getName()
 			List<Property> references = referencePattern.getProperties();
Index: tmp/org.txm.specificities.rcp/plugin.xml
===================================================================
--- tmp/org.txm.specificities.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.specificities.rcp/plugin.xml	(revision 698)
@@ -35,7 +35,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.tools.stat">
          <command
                commandId="org.txm.specificities.rcp.handlers.ComputeSpecifities"
                icon="icons/functions/specificities.png"
@@ -57,7 +57,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=menu.tools.separator.stats">
          <command
                commandId="org.txm.specificities.rcp.handlers.ComputeSpecifities"
                icon="icons/functions/specificities.png"
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.rcp/plugin.xml	(revision 698)
@@ -324,7 +324,7 @@
                id="menu.file"
                label="%menu.label">
             <separator
-                  name="org.txm.rcp.separator2"
+                  name="menu.file.separator.import"
                   visible="true">
             </separator>
             <menu
@@ -578,7 +578,7 @@
                </command>
             </menu>
             <separator
-                  name="fileSeparator1"
+                  name="menu.file.separator.file"
                   visible="true">
             </separator>
             <command
@@ -623,7 +623,7 @@
                   label="%command.label.93">
             </command>
             <separator
-                  name="org.txm.rcp.separator2"
+                  name="menu.file.separator.open"
                   visible="true">
             </separator>
             <command
@@ -633,7 +633,7 @@
                   tooltip="%command.tooltip">
             </command>
             <separator
-                  name="fileSeparator2"
+                  name="menu.file.separator.lang"
                   visible="true">
             </separator>
             <command
@@ -643,7 +643,7 @@
                   tooltip="%command.tooltip.42">
             </command>
             <separator
-                  name="org.txm.rcp.separator3"
+                  name="menu.file.separator.update"
                   visible="true">
             </separator>
             <command
@@ -684,7 +684,7 @@
                </visibleWhen>
             </command>
             <separator
-                  name="org.txm.rcp.separator1"
+                  name="menu.file.separator.close"
                   visible="true">
             </separator>
             <command
@@ -920,6 +920,14 @@
                id="menu.corpus"
                label="%menu.label.1"
                sibling_order="&lt;command&#x0A;                  commandId=&quot;org.txm.rcp.commands.function.ComputeConcordance&quot;&#x0A;                  icon=&quot;icons/functions/Concordances.png&quot;&#x0A;                  label=&quot;%command.label.11&quot;&#x0A;                  style=&quot;push&quot;&#x0A;                  tooltip=&quot;%command.tooltip.7&quot;&gt;&#x0A;               &lt;visibleWhen&#x0A;                     checkEnabled=&quot;false&quot;&gt;&#x0A;                  &lt;reference&#x0A;                        definitionId=&quot;OneCorpusSelected&quot;&gt;&#x0A;                  &lt;/reference&gt;&#x0A;               &lt;/visibleWhen&gt;&#x0A;            &lt;/command&gt;">
+            <separator
+                  name="menu.corpus.read"
+                  visible="true">
+            </separator>
+            <separator
+                  name="menu.corpus.manage"
+                  visible="true">
+            </separator>
             
             <command
                   commandId="org.txm.rcp.commands.base.DeleteObject"
@@ -984,15 +992,23 @@
          <menu
                id="menu.tools"
                label="%menu.label.6">
+            <separator
+                  name="menu.tools.separator.doc"
+                  visible="true">
+            </separator>
             
             <separator
-                  name="menu.tools.stats"
+                  name="menu.tools.separator.stats"
                   visible="true">
             </separator>
             <separator
-                  name="menu.tools.misc"
+                  name="menu.tools.separator.misc"
                   visible="true">
             </separator>
+            <separator
+                  name="menu.tools.separator.end"
+                  visible="true">
+            </separator>
             <command
                   commandId="org.eclipse.ui.window.preferences"
                   icon="icons/functions/prefs.png"
@@ -1897,14 +1913,13 @@
       <menuContribution
             locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
          <separator
-               id="org.txm.rcp.corporaview.begin"
                name="org.txm.rcp.corporaview.begin"
                visible="true"/>
-               <separator
-               id="org.txm.rcp.corporaview.export"
-               name="org.txm.rcp.corporaview.export"
-               visible="true"/>
-            <command
+               <menu
+                     icon="icons/functions/export.png"
+                     id="org.txm.rcp.corporaview.export"
+                     label="Exporter">
+                     <command
                   commandId="org.txm.rcp.commands.function.ExportResult"
                   icon="icons/functions/export_data.png"
                   label="%command.label.51"
@@ -1972,11 +1987,20 @@
                   </or>
                </visibleWhen>
             </command>
+               </menu>
+            
             <separator
                   name="org.txm.rcp.corporaview.corpus"
-                  id="org.txm.rcp.corporaview.corpus"
                   visible="true">
             </separator>
+            <separator
+                  name="org.txm.rcp.corporaview.corpus.read"
+                  visible="true">
+            </separator>
+            <separator
+                  name="org.txm.rcp.corporaview.corpus.manage"
+                  visible="true">
+            </separator>
             
             <command
                   commandId="org.txm.rcp.commands.base.DeleteObject"
@@ -2014,31 +2038,39 @@
             </command>
             <separator
                   name="org.txm.rcp.corporaview.annotation"
-                  id="org.txm.rcp.corporaview.annotation"
                   visible="true">
             </separator>
             <separator
                   name="org.txm.rcp.corporaview.tools"
-                  id="org.txm.rcp.corporaview.tools"
                   visible="true">
             </separator>
-            <command
-                  commandId="org.eclipse.ui.window.preferences"
-                  icon="icons/functions/prefs.png"
-                  label="%command.label.4"
-                  style="push"
-                  tooltip="%command.tooltip.0">
-            </command>
+            <separator
+                  name="org.txm.rcp.corporaview.tools.doc"
+                  visible="true">
+            </separator>
+            <separator
+                  name="org.txm.rcp.corporaview.tools.stat"
+                  visible="true">
+            </separator>
+            <separator
+                  name="org.txm.rcp.corporaview.tools.misc"
+                  visible="true">
+            </separator>
          <separator
                name="org.txm.rcp.corporaview.text"
-               id="org.txm.rcp.corporaview.text"
                visible="true">
          </separator>
          <separator
                name="org.txm.rcp.corporaview.file"
-               id="org.txm.rcp.corporaview.file"
                visible="true">
          </separator>
+            <command
+                  commandId="org.eclipse.ui.window.preferences"
+                  icon="icons/functions/prefs.png"
+                  label="%command.label.4"
+                  style="push"
+                  tooltip="%command.tooltip.0">
+            </command>
 
       </menuContribution>
       <menuContribution
Index: tmp/org.txm.wordcloud.rcp/plugin.xml
===================================================================
--- tmp/org.txm.wordcloud.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.wordcloud.rcp/plugin.xml	(revision 698)
@@ -38,7 +38,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?before=org.txm.rcp.corporaview.text">
          <command
                commandId="org.txm.wordcloud.rcp.handlers.ComputeWordCloud"
                icon="icons/functions/wordcloud.png"
@@ -60,7 +60,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=menu.tools.separator.misc">
          <command
                commandId="org.txm.wordcloud.rcp.handlers.ComputeWordCloud"
                icon="icons/functions/wordcloud.png"
Index: tmp/org.txm.backtomedia.rcp/plugin.xml
===================================================================
--- tmp/org.txm.backtomedia.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.backtomedia.rcp/plugin.xml	(revision 698)
@@ -14,7 +14,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:menu.file?after=file.open">
+            locationURI="menu:menu.file?after=menu.file.separator.open">
          <command
                commandId="org.txm.backtomedia.commands.function.OpenVLCPlayer"
                style="push">
Index: tmp/org.txm.partition.rcp/plugin.xml
===================================================================
--- tmp/org.txm.partition.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.partition.rcp/plugin.xml	(revision 698)
@@ -14,7 +14,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.corpus">
          <command
                commandId="org.txm.partition.rcp.handlers.ComputePartitionDimensionsBarChart"
                icon="icons/silk_dimensions.png"
@@ -49,7 +49,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.read">
          <command
                commandId="org.txm.partition.rcp.handlers.ComputePartitionDimensionsBarChart"
                icon="icons/silk_dimensions.png"
Index: tmp/org.txm.textsbalance.rcp/plugin.xml
===================================================================
--- tmp/org.txm.textsbalance.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.textsbalance.rcp/plugin.xml	(revision 698)
@@ -43,7 +43,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?before=org.txm.rcp.corporaview.text">
          <command
                commandId="org.txm.textsbalance.rcp.handlers.ComputeTextsBalance"
                icon="icons/balance.png"
@@ -57,7 +57,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=menu.tools.separator.misc">
          <command
                commandId="org.txm.textsbalance.rcp.handlers.ComputeTextsBalance"
                icon="icons/balance.png"
Index: tmp/org.txm.analec.rcp/plugin.xml
===================================================================
--- tmp/org.txm.analec.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.analec.rcp/plugin.xml	(revision 698)
@@ -56,7 +56,7 @@
          </menu>
       </menuContribution>
       <menuContribution
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.annotation">
          <menu
                id="corpora.menu.analec"
                label="%menu.label.0"
@@ -124,7 +124,7 @@
          </menu>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.file.export?after=menu.file.export.exporttei">
+            locationURI="menu:menu.file.export">
          <command
                commandId="org.txm.analec.commands.ExportTEICorpus"
                label="%command.label.0"
@@ -248,7 +248,7 @@
       </command>
    </extension>
    <extension
-         point="org.txm.synopticeditor.toolbarbutton">
+         point="org.txm.synopticedition.rcp.editors.ext.ToolbarButton">
       <Button
             class="org.txm.analec.toolbarbutton.StartButton"></Button>
    </extension>
Index: tmp/org.txm.tigersearch.rcp/plugin.xml
===================================================================
--- tmp/org.txm.tigersearch.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.tigersearch.rcp/plugin.xml	(revision 698)
@@ -37,7 +37,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=menu.tools.separator.misc">
          <command
                commandId="org.txm.tigersearch.commands.ComputeTIGERSearch"
                icon="icons/functions/TS.png"
Index: tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java
===================================================================
--- tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java	(revision 697)
+++ tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java	(revision 698)
@@ -29,7 +29,6 @@
 import org.txm.index.core.messages.IndexCoreMessages;
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
-import org.txm.rcp.RCPMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.clientExceptions.InvalidCqpIdException;
 import org.txm.searchengine.cqp.corpus.Corpus;
Index: tmp/org.txm.index.rcp/plugin.xml
===================================================================
--- tmp/org.txm.index.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.index.rcp/plugin.xml	(revision 698)
@@ -5,7 +5,7 @@
          point="org.eclipse.ui.menus">
          
       <menuContribution
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.tools.doc">
                     <command
                commandId="org.txm.index.rcp.handlers.ComputeLexicon"
                icon="icons/lexicon.png"
@@ -35,7 +35,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=menu.tools.separator.doc">
                     <command
                commandId="org.txm.index.rcp.handlers.ComputeLexicon"
                icon="icons/lexicon.png"
@@ -176,7 +176,7 @@
             categoryId="org.txm.rcp.category.txm"
             defaultHandler="org.txm.index.rcp.handlers.ComputeLexicon"
             id="org.txm.index.rcp.handlers.ComputeLexicon"
-            name="ComputeLexicon">
+            name="Lexicon">
       </command>
    </extension>
    <extension
Index: tmp/org.txm.searchengine.cqp.rcp/plugin.xml
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 698)
@@ -128,7 +128,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.export">
+            locationURI="popup:org.txm.rcp.corporaview.export">
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.ExportCorpus"
                icon="icons/functions/compress.png"
@@ -230,7 +230,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.read">
             <command
                   commandId="org.txm.searchengine.cqp.rcp.handlers.ComputeInformation"
                   icon="icons/functions/information.png"
@@ -242,6 +242,9 @@
                   </reference>
                </visibleWhen>
             </command>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.manage">
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.CreateSubCorpus"
                icon="icons/functions/subcorpus.png"
@@ -266,18 +269,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.corpus">
-            <command
-                  commandId="org.txm.searchengine.cqp.rcp.handlers.ComputeInformation"
-                  icon="icons/functions/information.png"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="OneCorpusSelected">
-                  </reference>
-               </visibleWhen>
-            </command>
+            locationURI="menu:menu.corpus?after=menu.corpus.build">
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.CreateSubCorpus"
                icon="icons/functions/subcorpus.png"
@@ -301,6 +293,20 @@
             </visibleWhen>
          </command>
       </menuContribution>
+      <menuContribution
+            locationURI="menu:menu.corpus?after=menu.corpus.read">
+         <command
+               commandId="org.txm.searchengine.cqp.rcp.handlers.ComputeInformation"
+               icon="icons/functions/information.png"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <reference
+                     definitionId="OneCorpusSelected">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
Index: tmp/org.txm.annotation.core/plugin.xml
===================================================================
--- tmp/org.txm.annotation.core/plugin.xml	(revision 697)
+++ tmp/org.txm.annotation.core/plugin.xml	(revision 698)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="org.txm.annotation.AnnotationEngine" name="org.txm.annotation.AnnotationEngine" schema="schema/org.txm.annotation.AnnotationEngine.exsd"/>
+   <extension-point id="org.txm.annotation.core.AnnotationEngine" name="org.txm.annotation.core.AnnotationEngine" schema="schema/org.txm.annotation.core.AnnotationEngine.exsd"/>
    <extension
          point="org.txm.EnginesManager">
    </extension>
Index: tmp/org.txm.annotation.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.annotation.core/META-INF/MANIFEST.MF	(revision 697)
+++ tmp/org.txm.annotation.core/META-INF/MANIFEST.MF	(revision 698)
@@ -5,15 +5,15 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.txm.annotation.core.Activator
 Meta-Persistence: META-INF/persistence.xml
-Require-Bundle: javax.persistence;bundle-version="2.1.0";visibility:=reexport,
+Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexport,
  org.txm.searchengine.cqp.core;visibility:=reexport,
+ org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
+ javax.persistence;bundle-version="2.1.0";visibility:=reexport,
  org.eclipse.persistence.asm;bundle-version="3.3.1";visibility:=reexport,
  org.eclipse.persistence.jpa;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.persistence.jpa.jpql;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.persistence.antlr;bundle-version="3.2.0";visibility:=reexport,
- org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.osgi;bundle-version="3.10.2";visibility:=reexport,
- org.txm.core;bundle-version="0.7.0";visibility:=reexport,
  org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.ui.workbench;visibility:=reexport,
  osgi.enterprise;bundle-version="4.2.0";visibility:=reexport,
@@ -77,7 +77,7 @@
  org.txm.annotation.core.repository,
  org.txm.annotation.core.storage.temporary,
  org.txm.annotation.core.temporary
-Bundle-ClassPath: .,
- libs/hsqldb.jar,
+Bundle-ClassPath: libs/hsqldb.jar,
  libs/postgresql-9.4.1207.jre6.jar,
- libs/sqlite-jdbc-3.8.11.2.jar
+ libs/sqlite-jdbc-3.8.11.2.jar,
+ .
Index: tmp/org.txm.annotation.core/schema/org.txm.annotation.AnnotationEngine.exsd
===================================================================
--- tmp/org.txm.annotation.core/schema/org.txm.annotation.AnnotationEngine.exsd	(revision 697)
+++ tmp/org.txm.annotation.core/schema/org.txm.annotation.AnnotationEngine.exsd	(revision 698)
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.txm.annotation.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.txm.annotation.core" id="org.txm.annotation.AnnotationEngine" name="org.txm.annotation.AnnotationEngine"/>
-      </appinfo>
-      <documentation>
-         Annotation engine
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <choice minOccurs="1" maxOccurs="unbounded">
-            <element ref="AnnotationEngine"/>
-         </choice>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="AnnotationEngine">
-      <complexType>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="org.txm.annotation.AnnotationEngine:"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
Index: tmp/org.txm.annotation.core/schema/org.txm.annotation.core.AnnotationEngine.exsd
===================================================================
--- tmp/org.txm.annotation.core/schema/org.txm.annotation.core.AnnotationEngine.exsd	(revision 0)
+++ tmp/org.txm.annotation.core/schema/org.txm.annotation.core.AnnotationEngine.exsd	(revision 698)
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.txm.annotation.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.txm.annotation.core" id="org.txm.annotation.core.AnnotationEngine" name="org.txm.annotation.core.AnnotationEngine"/>
+      </appinfo>
+      <documentation>
+         Annotation engine
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice minOccurs="1" maxOccurs="unbounded">
+            <element ref="AnnotationEngine"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="AnnotationEngine">
+      <complexType>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.txm.annotation.core.AnnotationEngine:"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>

Property changes on: tmp/org.txm.annotation.core/schema/org.txm.annotation.core.AnnotationEngine.exsd
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.annotation.core/src/org/txm/annotation/core/AnnotationEngines.java
===================================================================
--- tmp/org.txm.annotation.core/src/org/txm/annotation/core/AnnotationEngines.java	(revision 697)
+++ tmp/org.txm.annotation.core/src/org/txm/annotation/core/AnnotationEngines.java	(revision 698)
@@ -1,8 +1,6 @@
 package org.txm.annotation.core;
 
-import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
 import org.txm.Engine;
 import org.txm.EngineType;
 import org.txm.EnginesManager;
Index: tmp/org.txm.annotation.core/build.properties
===================================================================
--- tmp/org.txm.annotation.core/build.properties	(revision 697)
+++ tmp/org.txm.annotation.core/build.properties	(revision 698)
@@ -4,4 +4,5 @@
                libs/postgresql-9.4.1207.jre6.jar,\
                libs/sqlite-jdbc-3.8.11.2.jar,\
                .,\
-source.. = src/
+               source.. = src/,\
+               bin/
Index: tmp/org.txm.ca.rcp/plugin.xml
===================================================================
--- tmp/org.txm.ca.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.ca.rcp/plugin.xml	(revision 698)
@@ -35,7 +35,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.tools.stat">
          <command
                commandId="org.txm.ca.rcp.handlers.ComputeCA"
                icon="icons/ca.png"
@@ -57,7 +57,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?after=org.txm.specificities.rcp.handlers.ComputeSpecifities">
          <command
                commandId="org.txm.ca.rcp.handlers.ComputeCA"
                icon="icons/ca.png"
Index: tmp/org.txm.statsengine.r.rcp/plugin.xml
===================================================================
--- tmp/org.txm.statsengine.r.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.statsengine.r.rcp/plugin.xml	(revision 698)
@@ -59,7 +59,7 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="menu:menu.file">
+            locationURI="menu:menu.file?before=menu.file.separator.close">
          <command
                commandId="CheckRPackages"
                style="push">
@@ -115,7 +115,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.tools?before=menu.tools.separator.misc">
          <command
                commandId="SendToR"
                icon="icons/SendToR.png"
@@ -179,7 +179,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.tools.misc">
          <command
                commandId="SendToR"
                icon="icons/SendToR.png"
Index: tmp/org.txm.lexicaltable.rcp/plugin.xml
===================================================================
--- tmp/org.txm.lexicaltable.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.lexicaltable.rcp/plugin.xml	(revision 698)
@@ -13,7 +13,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.manage">
          <command
                commandId="org.txm.lexicaltable.rcp.handlers.ComputeLexicalTable"
                icon="icons/lexicaltable.png"
@@ -35,7 +35,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.corpus">
          <command
                commandId="org.txm.lexicaltable.rcp.handlers.ComputeLexicalTable"
                icon="icons/lexicaltable.png"
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZPager.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZPager.groovy	(revision 697)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZPager.groovy	(revision 698)
@@ -197,10 +197,13 @@
 					continue;
 				}
 
+				
 				def pages = ed.getPageFiles()
 				for (i = 0 ; i < pages.size();) {
 					File f = pages[i][0];
 					String wordid = pages[i][1]
+					//TODO replace '""+(++i)' with something that fetch/findout the page 'name'
+					// TODO or move the Edition and Page corpus declaration in the XTZDefaultPagerStep 
 					params.addPage(edition, ""+(++i), wordid);
 					//println "add facs page: $f $wordid"
 				}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZDefaultPagerStep.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZDefaultPagerStep.groovy	(revision 697)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZDefaultPagerStep.groovy	(revision 698)
@@ -79,6 +79,7 @@
 	File outfile;
 
 	/** The pages. */
+	//TODO enhance this to store the page name/id as well
 	ArrayList<File> pages = new ArrayList<File>();
 
 	/** The idxstart. */
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/macro/nlp/TT2XMLInDirectoryMacro.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/macro/nlp/TT2XMLInDirectoryMacro.groovy	(revision 0)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/macro/nlp/TT2XMLInDirectoryMacro.groovy	(revision 698)
@@ -0,0 +1,112 @@
+package org.txm.macro.nlp;
+	
+	import org.kohsuke.args4j.*
+	import groovy.transform.Field
+	import java.nio.charset.Charset
+	import org.txm.rcpapplication.swt.widget.parameters.*
+	import org.txm.utils.*
+	import javax.xml.stream.*
+	
+	@Field @Option(name="inputDirectory", usage="TXT directory", widget="Folder", required=true, def="dir")
+	File inputDirectory
+	
+	@Field @Option(name="encoding", usage="File encoding", widget="String", required=false, def="UTF-8")
+	String encoding
+	
+	@Field @Option(name="debug", usage="Debug mode", widget="Boolean", required=false, def="false")
+	Boolean debug
+	
+	if (!ParametersDialog.open(this)) return
+	
+	encoding = encoding.trim()
+	outputDirectory = new File(inputDirectory, "xml")
+	outputDirectory.mkdir()
+	
+	println "Processing: "+inputDirectory
+	
+	XMLOutputFactory factory = XMLOutputFactory.newInstance()
+	
+	for (File inputfile : inputDirectory.listFiles().sort()) {
+		if (inputfile.isDirectory() || inputfile.isHidden() || !inputfile.getName().endsWith(".tt")) continue // ignore
+		println " file: "+inputfile
+	
+		name = inputfile.getName()
+		idx = name.lastIndexOf(".")
+		if (idx > 0) name = name.substring(0, idx)
+		outputfile = new File(outputDirectory, name+".xml")
+		
+		Writer output = new OutputStreamWriter(new FileOutputStream(outputfile) , "UTF-8")
+		XMLStreamWriter writer = factory.createXMLStreamWriter(output)
+	
+		writer.writeStartDocument("UTF-8","1.0")
+		writer.writeCharacters("\n")
+		writer.writeStartElement("text")
+		writer.writeCharacters("\n")
+	
+		inSent = 0
+		nLine = 0
+		inputfile.eachLine(encoding) { line ->
+		
+			nLine++
+			
+			if (debug) {
+				println nLine+": "+line
+			}
+			
+			def sent = false
+	        def sent_pattern = ~/^([^\t]+)\t(SENT)\t([^\t]+)$/
+	        def sent_m = (line =~ sent_pattern)
+	        if (sent_m) sent = true
+	        	
+			if (sent && inSent) {
+				writer.writeStartElement("w")
+				writer.writeAttribute("frpos", sent_m[0][2])
+				writer.writeAttribute("frlemma", sent_m[0][3])
+				writer.writeCharacters(sent_m[0][3])
+				writer.writeEndElement() // close w		
+				writer.writeCharacters("\n")
+				writer.writeEndElement() // close s
+				writer.writeEndElement() // close p (sent)
+				writer.writeCharacters("\n")
+				inSent=0
+			} else {
+				if (!inSent) {
+					writer.writeStartElement("p")
+					writer.writeStartElement("s")
+					inSent=1
+				}
+				def w_pattern = ~/^([^\t]+)\t([^\t]+)\t([^\t]+)$/
+	        	def w_m = (line =~ w_pattern)
+	
+	        	if (w_m.size() > 0) {
+	        		writer.writeStartElement("w")
+					writer.writeAttribute("frpos", w_m[0][2])
+					writer.writeAttribute("frlemma", w_m[0][3])
+					writer.writeCharacters(w_m[0][1])
+					writer.writeEndElement() // close w
+					writer.writeCharacters("\n")
+				} else {
+				    writer.writeStartElement("w")
+					writer.writeAttribute("frpos", "NAM")
+					writer.writeAttribute("frlemma", "<unknown>")
+					writer.writeCharacters(line)
+					writer.writeEndElement() // close w
+					writer.writeCharacters("\n")
+					println "** TT2XMLInDirectory: unknown [word] line pattern, "+nLine+": <"+line+">."
+				}
+			}
+		}
+	
+		if (inSent) {
+			writer.writeEndElement() // s
+			writer.writeEndElement() // p
+			writer.writeCharacters("\n")
+			
+		}
+		writer.writeEndElement()
+		writer.writeCharacters("\n")
+		writer.close()
+		output.close()
+	}
+	
+
Index: tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginExtPoints.java
===================================================================
--- tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginExtPoints.java	(revision 697)
+++ tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginExtPoints.java	(revision 698)
@@ -41,9 +41,7 @@
 				ArrayList<String> ids = IOUtils.findWithGroup(schemaXML, "<meta.schema plugin=\"[^\"]+\" id=\"([^\"]+)\" name=\"[^\"]+\"/>", true);
 				ArrayList<String> classes = IOUtils.findWithGroup(schemaXML, "<meta.attribute kind=\"java\" basedOn=\"([^:]+):\"/>", true);
 				if (ids.size() != classes.size()) {
-					System.out.println("Error: found different number of ids than classes in "+schemaXML);
-					System.out.println("ids\t"+ids);
-					System.out.println("classes\t"+classes);
+					continue; // not a Java based extension
 				}
 				for (int i = 0 ; i < ids.size() ; i++) {
 					String id = ids.get(i);
@@ -91,8 +89,15 @@
 				File schemaDirectory = new File(projectDirectory, "schema");
 				if (schemaDirectory.exists()) {
 					for (File schemaXML : schemaDirectory.listFiles()) {
+						if (!schemaXML.isFile()) continue;
+						if (!schemaXML.getName().endsWith(".exsd")) continue;
 						ArrayList<String> ids = IOUtils.findWithGroup(schemaXML, "<meta.schema plugin=\"[^\"]+\" id=\"([^\"]+)\" name=\"[^\"]+\"/>", true);
 						ArrayList<String> classes = IOUtils.findWithGroup(schemaXML, "<meta.attribute kind=\"java\" basedOn=\"([^:]+):\"/>", true);
+						
+						if (ids.size() != classes.size()) {
+							continue; // not a Java based schema
+						}
+						
 						for (int i = 0 ; i < ids.size() ; i++) {
 							String id = ids.get(i);
 							String clazz = classes.get(i);
Index: tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginMenuContributions.java
===================================================================
--- tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginMenuContributions.java	(revision 697)
+++ tmp/org.txm.core.tests/src/org/txm/core/tests/junit/PluginMenuContributions.java	(revision 698)
@@ -54,20 +54,33 @@
 					type= "popup";
 					target = location.substring(6);
 				} else {
-					error("wrong contribution type: "+location);
+					error("wrong contribution type ("+type+"): "+location);
 				}
-				
+
 				String position = "";
 				if (target.contains("?")) {
 					position = target.substring(target.indexOf("?")+1);
+					if (position.startsWith("after=")) {
+						position = position.substring(6);
+					} else if (position.startsWith("before=")) {
+						position = position.substring(7);
+					}
+					
 					target = target.substring(0, target.indexOf("?"));
 				}
 				//System.out.println(type+" -> "+target+" : "+position);
 				if (!allMenus.contains(target)) {
-					error("wrong contribution target: "+location);
+					error("wrong contribution target ("+target+"): "+location);
 				}
+
+				if (position.length() > 0) {
+					if (!allSeparators.contains(position)) {
+						//System.out.println("ERROR '"+position+"' not in "+allSeparators);
+						error("wrong contribution position ("+position+"): "+location);
+					}
+				}
 			}
-			
+
 		}
 	}
 
@@ -77,48 +90,59 @@
 			allMenus.add("org.eclipse.ui.main.menu"); // eclipse main menu
 			allMenus.add("#TextEditorContext"); // text editor context
 			for (File projectDirectory : projects) {
-				
+
 				File pluginXML = new File(projectDirectory, "plugin.xml");
 				if (pluginXML.exists()) {
 					ArrayList<String> ids = IOUtils.findWithGroup(pluginXML, "menu id=\"([^\"]+)\"", true);
 					allMenus.addAll(ids);
+					allSeparators.addAll(ids);
 					
 					ids = IOUtils.findWithGroup(pluginXML, "menu icon=\"[^\"]+\" id=\"([^\"]+)\"", true);
 					allMenus.addAll(ids);
+					allSeparators.addAll(ids);
+					
 					//allowMultiple="false"
 					ArrayList<String> views = IOUtils.findWithGroup(pluginXML, "<view category=\"[^\"]+\" class=\"([^\"]+)\"", true);
 					for (String view : views) {
 						allMenus.add(view);
 					}
-					
+
 					views = IOUtils.findWithGroup(pluginXML, "<view allowMultiple=\"[^\"]+\" category=\"[^\"]+\" class=\"([^\"]+)\"", true);
 					for (String view : views) {
 						allMenus.add(view);
 					}
-					
+
 					views = IOUtils.findWithGroup(pluginXML, "<view class=\"([^\"]+)\"", true);
 					for (String view : views) {
 						allMenus.add(view);
 					}
-					
+
 					ArrayList<String> editors = IOUtils.findWithGroup(pluginXML, "<editor class=\"([^\"]+)\"", true);
 					for (String editor : editors) {
 						allMenus.add(editor);
 					}
-					
+
 					ArrayList<String> toolbars = IOUtils.findWithGroup(pluginXML, "<toolbar id=\"([^\"]+)\"", true);
 					for (String toolbar : toolbars) {
 						allMenus.add(toolbar);
 					}
-					
-					ArrayList<String> separators = IOUtils.findWithGroup(pluginXML, "<separator id=\"([^\"]+)\"", true);
+
+					ArrayList<String> separators = IOUtils.findWithGroup(pluginXML, "<separator name=\"([^\"]+)\"", true);
 					for (String separator : separators) {
 						allSeparators.add(separator);
 					}
-					
+
+					ArrayList<String> commands = IOUtils.findWithGroup(pluginXML, "<command commandId=\"([^\"]+)\"", true);
+					for (String command : commands) {
+						allSeparators.add(command);
+					}
+
 				}
 			}
+			
 			System.out.println("all menus: "+allMenus);
+
+			System.out.println("all separators: "+allSeparators);
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
Index: tmp/org.txm.xmleditor.rcp/plugin.xml
===================================================================
--- tmp/org.txm.xmleditor.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.xmleditor.rcp/plugin.xml	(revision 698)
@@ -13,7 +13,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:menu.file?after=file.open">
+            locationURI="menu:menu.file?after=menu.file.separator.open">
          <command
                commandId="org.txm.xmleditor.OpenXMLEditor"
                style="push">
Index: tmp/org.txm.internalview.rcp/plugin.xml
===================================================================
--- tmp/org.txm.internalview.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.internalview.rcp/plugin.xml	(revision 698)
@@ -27,7 +27,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.read">
          <command
                commandId="org.txm.internalview.rcp.handlers.ComputeInternalView"
                icon="icons/internal_view.png"
@@ -41,7 +41,7 @@
          </command>
       </menuContribution>
       <menuContribution
-            locationURI="menu:menu.tools">
+            locationURI="menu:menu.corpus?after=menu.corpus.read">
          <command
                commandId="org.txm.internalview.rcp.handlers.ComputeInternalView"
                icon="icons/internal_view.png"
Index: tmp/org.txm.referencer.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- tmp/org.txm.referencer.rcp/OSGI-INF/l10n/bundle.properties	(revision 697)
+++ tmp/org.txm.referencer.rcp/OSGI-INF/l10n/bundle.properties	(revision 698)
@@ -1,3 +1,5 @@
-command.name.57 = RefToConc
-editor.name.14=Referencer
-command.name.44=References
\ No newline at end of file
+
+command.name.44 = References
+command.name.57 = To concordances
+
+editor.name.14 = Referencer
Index: tmp/org.txm.referencer.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- tmp/org.txm.referencer.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 697)
+++ tmp/org.txm.referencer.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 698)
@@ -1,2 +1,5 @@
-editor.name.14=Référenceur
-command.name.44=Références
\ No newline at end of file
+
+command.name.44 = R\u00E9f\u00E9rences
+command.name.57 = Vers les concordances
+
+editor.name.14 = R\u00E9f\u00E9renceur
Index: tmp/org.txm.referencer.rcp/plugin.xml
===================================================================
--- tmp/org.txm.referencer.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.referencer.rcp/plugin.xml	(revision 698)
@@ -14,7 +14,7 @@
    <extension
          point="org.eclipse.ui.menus">
                <menuContribution
-                     locationURI="menu:menu.tools">
+                     locationURI="menu:menu.tools?after=menu.tools.separator.misc">
                      <command
                   commandId="org.txm.referencer.rcp.handlers.ComputeReferencer"
                   icon="icons/functions/referencer.png"
@@ -44,7 +44,7 @@
                </menuContribution>
                <menuContribution
                      allPopups="false"
-                     locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+                     locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.progression.rcp.handlers.ComputeProgression">
                   <command
                         commandId="org.txm.referencer.rcp.handlers.ComputeReferencer"
                         icon="icons/functions/referencer.png"
Index: tmp/org.txm.ahc.rcp/plugin.xml
===================================================================
--- tmp/org.txm.ahc.rcp/plugin.xml	(revision 697)
+++ tmp/org.txm.ahc.rcp/plugin.xml	(revision 698)
@@ -38,7 +38,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.txm.rcp.views.corpora.CorporaView">
+            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.tools.stat">
          <command
                commandId="org.txm.cah.rcp.handlers.ComputeAHC"
                icon="icons/cah.png"
