Index: TXM/trunk/org.txm.rcp/icons/objects/books.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/VERSION
===================================================================
--- TXM/trunk/org.txm.rcp/VERSION	(revision 0)
+++ TXM/trunk/org.txm.rcp/VERSION	(revision 3292)
@@ -0,0 +1 @@
+0.8.2
\ No newline at end of file
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/AbstractSplashHandler2.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/AbstractSplashHandler2.java	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/AbstractSplashHandler2.java	(revision 3292)
@@ -1,103 +0,0 @@
-// Copyright © 2010-2020 ENS de Lyon., University of Franche-Comté
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.rcp;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.internal.splash.EclipseSplashHandler;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-//// TODO: Auto-generated Javadoc
-///**
-// * SplashScreen for TXM: not used yet
-// */
-//public class AbstractSplashHandler2 extends BasicSplashHandler {
-//
-//	/**
-//	 * Instantiates a new abstract splash handler2.
-//	 */
-//	public AbstractSplashHandler2() {
-//		Composite c = this.getContent();
-//		new Label(c, SWT.BORDER).setText(Messages.AbstractSplashHandler2_0);
-//		IProgressMonitor bundle = this.getBundleProgressMonitor();
-//		// .subTask("HELLLOOOOO");
-//		this.getBundleProgressMonitor().setTaskName(Messages.AbstractSplashHandler2_1);
-//		System.out.println(Messages.AbstractSplashHandler2_2);
-//	}
-//
-//	/**
-//	 * Hurler.
-//	 *
-//	 * @param message the message
-//	 */
-//	public static void hurler(String message) {
-//
-//	}
-//}
-
-public class AbstractSplashHandler2 extends EclipseSplashHandler {
-	
-	private static final int BORDER = 10;
-	
-	private Image image;
-	
-	@Override
-	public void init(Shell splash) {
-		super.init(splash);
-		
-		// here you could check some condition on which decoration to show
-		
-		ImageDescriptor descriptor = IImageKeys.getImageDescriptor(IImageKeys.TXM);
-		if (descriptor != null) {
-			image = descriptor.createImage();
-		}
-		if (image != null) {
-			final int xposition = splash.getSize().x - image.getImageData().width - BORDER;
-			final int yposition = BORDER;
-			getContent().addPaintListener(new PaintListener() {
-				
-				@Override
-				public void paintControl(PaintEvent e) {
-					e.gc.drawImage(image, xposition, yposition);
-				}
-			});
-		}
-	}
-	
-	@Override
-	public void dispose() {
-		super.dispose();
-		if (image != null) {
-			image.dispose();
-		}
-	}
-	
-}
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 3292)
@@ -496,7 +496,7 @@
 
 fileExplorerColonIncorrectPattern = ** Explorateur de fichiers : expression régulière incorrecte
 
-firstLaunchOfTXM = Premier lancement de TXM
+firstLaunchOfTXMP0 = Premier lancement de TXM {0}
 
 folderP0ShouldNotBeDeleted = Le dossier {0} ne devrait pas être supprimé
 
@@ -722,6 +722,8 @@
 
 numberOfLinesColon = Nombre de lignes : {0}.
 
+numberOfLines = Nombre de lignes
+
 numberOfNodesColon = Nombre de noeuds : {0}.
 
 objColon = Objet : 
@@ -940,8 +942,10 @@
 
 startJobColonLoadInstallPreferences = Démarrage : chargement des préférences d'installation
 
-startingUpP0 = Démarrage de TXM {0} ({1})…
+startingUpP0 = Démarrage de TXM {0}…
 
+prettyVersionP0P1 = {0} ({1})
+
 startingUpdateFetch = Démarrage de la récupération des mises à jour
 
 startsWith = commence par
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 3292)
@@ -922,6 +922,8 @@
 	
 	public static String startingUpP0;
 	
+	public static String prettyVersionP0P1;
+	
 	public static String startingUpdateFetch;
 	
 	public static String startsWith;
@@ -1118,7 +1120,7 @@
 	
 	public static String selectWorkingDirectory;
 	
-	public static String firstLaunchOfTXM;
+	public static String firstLaunchOfTXMP0;
 	
 	public static String LoadBinaryCorporaDirectory_aCorpusNamedP0alreadyExistsLoadingOfP1Canceled;
 	
@@ -1177,6 +1179,8 @@
 	public static String performWordSegmentationWithinWord;
 
 	public static String xmlTagNameThatEncodesWords;
+
+	public static String numberOfLines;
 	
 	static {
 		// initialize resource bundle
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 3292)
@@ -528,7 +528,7 @@
 
 fileExplorerColonIncorrectPattern = ** File Explorer: Incorrect Regular Expression
 
-firstLaunchOfTXM = First launch of TXM
+firstLaunchOfTXMP0 = First launch of TXM {0}
 
 folderP0ShouldNotBeDeleted = Folder {0} should not be deleted
 
@@ -760,7 +760,9 @@
 
 numberOfEdgesColon = Number of edges: {0}.
 
-numberOfLinesColon = Number of lines: {0}.
+numberOfLinesColon = Number of lines: {0}.
+
+numberOfLines = Number of lines
 
 numberOfNodesColon = Number of nodes: {0}.
 
@@ -984,7 +986,9 @@
 
 startingTxm = Starting TXM
 
-startingUpP0 = Starting TXM {0} ({1})…
+startingUpP0 = Starting TXM {0}…
+
+prettyVersionP0P1 = {0} ({1})
 
 startingUpdateFetch = Starting updates retrieval
 
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/Activator.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/Activator.java	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/Activator.java	(revision 3292)
@@ -31,6 +31,10 @@
 import java.io.File;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 import org.txm.utils.io.IOUtils;
@@ -63,7 +67,7 @@
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
-
+		
 		System.out.println("TXM ACTIVATED. ALL SYSTEMS GO!");
 //		try {
 //			preventBrokenTXMINI();
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 3292)
@@ -1048,8 +1048,8 @@
 	 * @param result
 	 * @param editorPartId
 	 */
-	public static TXMEditor<? extends TXMResult> openEditor(TXMResult result, String editorPartId) {
-		return openEditor(new TXMResultEditorInput<>(result), editorPartId);
+	public static <T extends TXMResult> TXMEditor<T> openEditor(T result, String editorPartId) {
+		return openEditor(new TXMResultEditorInput<T>(result), editorPartId);
 	}
 	
 	/**
@@ -1061,9 +1061,9 @@
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	public static TXMEditor<? extends TXMResult> openEditor(TXMResultEditorInput<? extends TXMResult> editorInput, String editorId) {
+	public static <T extends TXMResult> TXMEditor<T> openEditor(TXMResultEditorInput<T> editorInput, String editorId) {
 		
-		TXMEditor<? extends TXMResult> editor = null;
+		TXMEditor<T> editor = null;
 		IWorkbenchWindow window = TXMWindows.getActiveWindow();
 		IWorkbenchPage page = window.getActivePage();
 		try {
@@ -1099,10 +1099,10 @@
 			// opening the editor
 			IEditorPart tmpEditor = page.openEditor(editorInput, editorId, true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
 			if (tmpEditor instanceof TXMEditor) {
-				editor = (TXMEditor<? extends TXMResult>) tmpEditor;
+				editor = (TXMEditor<T>) tmpEditor;
 			}
 			else if (tmpEditor instanceof TXMMultiPageEditor) {
-				editor = (TXMEditor<? extends TXMResult>) ((TXMMultiPageEditor) tmpEditor).getMainEditorPart();
+				editor = (TXMEditor<T>) ((TXMMultiPageEditor) tmpEditor).getMainEditorPart();
 				
 				// If result specify a opening Area use it
 				
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/splashHandlers/TXMSplashHandler.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/splashHandlers/TXMSplashHandler.java	(revision 0)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/splashHandlers/TXMSplashHandler.java	(revision 3292)
@@ -0,0 +1,144 @@
+// Copyright © 2010-2020 ENS de Lyon., University of Franche-Comté
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+// 
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+// 
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+// 
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+// 
+// 
+// 
+// $LastChangedDate:$
+// $LastChangedRevision:$
+// $LastChangedBy:$ 
+//
+package org.txm.rcp.splashHandlers;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.internal.splash.EclipseSplashHandler;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.Version;
+import org.txm.rcp.Activator;
+import org.txm.rcp.ApplicationWorkbenchAdvisor;
+import org.txm.rcp.IImageKeys;
+import org.txm.rcp.messages.TXMUIMessages;
+
+//// TODO: Auto-generated Javadoc
+///**
+// * SplashScreen for TXM: not used yet
+// */
+//public class AbstractSplashHandler2 extends BasicSplashHandler {
+//
+//	/**
+//	 * Instantiates a new abstract splash handler2.
+//	 */
+//	public AbstractSplashHandler2() {
+//		Composite c = this.getContent();
+//		new Label(c, SWT.BORDER).setText(Messages.AbstractSplashHandler2_0);
+//		IProgressMonitor bundle = this.getBundleProgressMonitor();
+//		// .subTask("HELLLOOOOO");
+//		this.getBundleProgressMonitor().setTaskName(Messages.AbstractSplashHandler2_1);
+//		System.out.println(Messages.AbstractSplashHandler2_2);
+//	}
+//
+//	/**
+//	 * Hurler.
+//	 *
+//	 * @param message the message
+//	 */
+//	public static void hurler(String message) {
+//
+//	}
+//}
+
+public class TXMSplashHandler extends EclipseSplashHandler {
+	
+	private static final int BORDER = 10;
+	
+	Font font;
+	Color greenTXM, redTXM;
+	
+	String version, infos, level;
+	@Override
+	public void init(Shell splash) {
+		super.init(splash);
+		
+		
+		
+		// here you could check some condition on which decoration to show
+		
+		version = "TXM "+ApplicationWorkbenchAdvisor.getTXMVersion();
+		
+		String build_date =  ApplicationWorkbenchAdvisor.getBuildDate(ApplicationWorkbenchAdvisor.getBuildVersion());
+		
+		String txm_date = ApplicationWorkbenchAdvisor.getUpdateDate();
+		
+		level = ApplicationWorkbenchAdvisor.getVersionLevel().toUpperCase();
+		
+		greenTXM = new Color(splash.getDisplay(), 109,139,0);
+		redTXM = new Color(splash.getDisplay(), 255,0,0);
+		font = new Font(splash.getDisplay(), "Arial", 17, SWT.BOLD);
+		
+		if (txm_date.equals(build_date)) {
+			infos = build_date;
+		}
+		else {
+			infos = "update " + txm_date + " - build " + build_date;
+		}
+		
+		if ("STABLE".equals(level)) {
+			level = null;
+		}
+		
+		getContent().addPaintListener(new PaintListener() {
+			
+			@Override
+			public void paintControl(PaintEvent e) {
+				e.gc.setFont(font);
+				e.gc.setForeground(greenTXM);
+				Point textSize2 = e.gc.textExtent(version);
+				e.gc.drawString(version, (int) (316 - textSize2.x - (BORDER*1.5)), 230, true);
+				
+				Point textSize = e.gc.textExtent(infos);
+				e.gc.drawString(infos, (int) (316 - textSize.x - (BORDER*1.5)), 233 + textSize2.y, true);
+				
+				if (level != null) {
+					e.gc.setForeground(redTXM);
+					textSize = e.gc.textExtent(level);
+					e.gc.drawString(level, (int) (316 - textSize.x - (BORDER*1.5)), 2*BORDER, true);
+				}
+			}
+		});
+	}
+	
+	@Override
+	public void dispose() {
+		super.dispose();
+	}
+	
+}

Property changes on: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/splashHandlers/TXMSplashHandler.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/CGUMessageDialog.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/CGUMessageDialog.java	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/CGUMessageDialog.java	(revision 3292)
@@ -23,6 +23,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.internal.ide.ChooseWorkspaceData;
+import org.txm.rcp.ApplicationWorkbenchAdvisor;
 import org.txm.rcp.IImageKeys;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.swt.SelectDirectoryWidget;
@@ -43,7 +44,7 @@
 
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.firstLaunchOfTXM);
+		newShell.setText(TXMUIMessages.bind(TXMUIMessages.firstLaunchOfTXMP0, ApplicationWorkbenchAdvisor.getTXMVersionPrettyString()));
 	}
 
 	@Override
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3291)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3292)
@@ -33,12 +33,9 @@
 import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -54,12 +51,6 @@
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
 import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
-import org.eclipse.equinox.internal.p2.engine.Profile;
-import org.eclipse.equinox.p2.core.IProvisioningAgent;
-import org.eclipse.equinox.p2.engine.IProfile;
-import org.eclipse.equinox.p2.engine.IProfileRegistry;
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.p2.ui.ProvisioningUI;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -109,7 +100,6 @@
 import org.txm.rcp.commands.OpenWelcomePage;
 import org.txm.rcp.commands.RestartTXM;
 import org.txm.rcp.commands.workspace.LoadBinaryCorporaDirectory;
-import org.txm.rcp.handlers.results.DeleteObject;
 import org.txm.rcp.handlers.scripts.ExecuteGroovyScript;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.p2.plugins.TXMUpdateHandler;
@@ -294,8 +284,37 @@
 		}
 	}
 	
-	public static void printTXMVersion() {
+	public static String getTXMStartMessage() {
 		
+		String pretty_version =  getTXMVersionPrettyString();
+			return NLS.bind(TXMUIMessages.startingUpP0, pretty_version);
+		
+	}
+	
+	public static String getTXMVersion() {
+		Version version = Activator.getDefault().getBundle().getVersion();
+		return version.getMajor() + "." + version.getMinor() + "." + version.getMicro();
+	}
+	
+	public static String getTXMVersionPrettyString() {
+				
+		Version version = getBuildVersion();
+		String build_date =  getBuildDate(version);
+		
+		String txm_date = getUpdateDate();
+		version = Activator.getDefault().getBundle().getVersion();
+		
+		if (txm_date.equals(build_date)) {
+			return (NLS.bind(TXMUIMessages.prettyVersionP0P1,
+					version.getMajor() + "." + version.getMinor() + "." + version.getMicro(), build_date));
+		}
+		else {
+			return (NLS.bind(TXMUIMessages.prettyVersionP0P1,
+					version.getMajor() + "." + version.getMinor() + "." + version.getMicro(), "update " + txm_date + " - build " + build_date));
+		}
+	}
+	
+	public static Version getBuildVersion() {
 		String version = null;
 		
 		// try finding build date from the p2 artifacts file in installation directory
@@ -338,21 +357,18 @@
 		}
 		
 		Version v2 = new Version(version);
-		String build_date = v2.getQualifier().replaceAll("(....)(..)(..)(..)(..)", "$1-$2-$3 $4h$5"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		Version v = Activator.getDefault().getBundle().getVersion();
-		String txm_date = v.getQualifier().replaceAll("(....)(..)(..)(..)(..)", "$1-$2-$3 $4h$5");
-		
-		if (txm_date.equals(build_date)) {
-			System.out.println(NLS.bind(TXMUIMessages.startingUpP0,
-					v.getMajor() + "." + v.getMinor() + "." + v.getMicro(), build_date));
-		}
-		else {
-			System.out.println(NLS.bind(TXMUIMessages.startingUpP0,
-					v.getMajor() + "." + v.getMinor() + "." + v.getMicro(), "update " + txm_date + " - build " + build_date));
-		}
+		return v2;
 	}
 	
+	public static String getBuildDate(Version version) {
+		return version.getQualifier().replaceAll("(....)(..)(..)(..)(..)", "$1-$2-$3 $4h$5"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+	public static String getUpdateDate() {
+		Version version = Activator.getDefault().getBundle().getVersion();
+		return version.getQualifier().replaceAll("(....)(..)(..)(..)(..)", "$1-$2-$3 $4h$5");
+	}
+	
 	private void setPreferencesConfiguration() {
 		PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
 		
@@ -1069,7 +1085,7 @@
 			@Override
 			public void run() {
 				try {
-					printTXMVersion();
+					System.out.println(getTXMStartMessage());
 					
 					// ensure some preferences are set
 					DefaultScope.INSTANCE.getNode("org.eclipse.ui.workbench").putBoolean(IPreferenceConstants.RUN_IN_BACKGROUND, false); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
@@ -1161,4 +1177,17 @@
 		// TxmPreferences.dump();
 		return initializeUIPMD != null && !initializeUIPMD.getProgressMonitor().isCanceled();
 	}
+
+	public static String getVersionLevel() {
+		try {
+			URL url = Activator.getDefault().getBundle().getResource("SUBVERSION");
+			String subversion = IOUtils.getText(url, "UTF-8");
+			return subversion;
+		}
+		catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return "STABLE";
+	}
 }
Index: TXM/trunk/org.txm.rcp/rcpapplication.product
===================================================================
--- TXM/trunk/org.txm.rcp/rcpapplication.product	(revision 3291)
+++ TXM/trunk/org.txm.rcp/rcpapplication.product	(revision 3292)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="TXM" uid="org.txm.rcp.app" id="org.txm.rcp.product" application="org.txm.rcp.Application" version="0.8.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="TXM" uid="org.txm.rcp.app" id="org.txm.rcp.product" application="org.txm.rcp.Application" version="0.8.2.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.txm.rcp/icons/logo/about TXM.png"/>
       <text>
          [Contrat d&apos;utilisation du logiciel TXM]
 
-TXM 0.8.1 Copyright © 2010-2021 ENS de Lyon, University of Franche-Comté, CNRS
+TXM 0.8.2 Copyright © 2010-2021 ENS de Lyon, University of Franche-Comté, CNRS
 
 &lt;English version below&gt;
 
Index: TXM/trunk/org.txm.rcp/build.properties
===================================================================
--- TXM/trunk/org.txm.rcp/build.properties	(revision 3291)
+++ TXM/trunk/org.txm.rcp/build.properties	(revision 3292)
@@ -17,7 +17,9 @@
                TXM.sh,\
                icons/,\
                OSGI-INF/,\
-               OSGI-INF/l10n/bundle.properties
+               OSGI-INF/l10n/bundle.properties,\
+               SUBVERSION,\
+               VERSION
 source..=src/main/java/
 bin.excludes = lib/batik/
 #qualifier=svn
Index: TXM/trunk/org.txm.rcp/plugin.xml
===================================================================
--- TXM/trunk/org.txm.rcp/plugin.xml	(revision 3291)
+++ TXM/trunk/org.txm.rcp/plugin.xml	(revision 3292)
@@ -52,7 +52,7 @@
          </property>
          <property
                name="aboutText"
-               value="[Contrat d&apos;utilisation du logiciel TXM]&#x0A;&#x0A;TXM 0.8.1 Copyright © 2010-2021 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE INSTALLATION OU MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.&#x0A;&#x0A;Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.&#x0A;&#x0A;Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.&#x0A;&#x0A;Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.&#x0A;TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.&#x0A;Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;&#x0A;&#x0A;&#x0A;ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH&#x0A;&#x0A;[TXM Software User Agreement]&#x0A;&#x0A;By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.&#x0A;&#x0A;The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.&#x0A;&#x0A;The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&#x0A;&#x0A;You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;** Serge Heiden. The TXM Platform: Building Open-Source Textual&#x0A;Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;">
+               value="[Contrat d&apos;utilisation du logiciel TXM]&#x0A;&#x0A;TXM 0.8.2 Copyright © 2010-2021 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE INSTALLATION OU MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.&#x0A;&#x0A;Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.&#x0A;&#x0A;Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.&#x0A;&#x0A;Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.&#x0A;TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.&#x0A;Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;&#x0A;&#x0A;&#x0A;ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH&#x0A;&#x0A;[TXM Software User Agreement]&#x0A;&#x0A;By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.&#x0A;&#x0A;The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.&#x0A;&#x0A;The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&#x0A;&#x0A;You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;** Serge Heiden. The TXM Platform: Building Open-Source Textual&#x0A;Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;">
          </property>
          <property
                name="startupProgressRect"
@@ -3136,12 +3136,12 @@
    <extension
          point="org.eclipse.ui.splashHandlers">
       <splashHandler
-            class="org.txm.rcp.AbstractSplashHandler2"
-            id="org.txm.rcp.AbstractSplashHandler2">
+            class="org.txm.rcp.splashHandlers.TXMSplashHandler"
+            id="org.txm.rcp.splashHandlers.TXMSplashHandler">
       </splashHandler>
       <splashHandlerProductBinding
-            productId="org.txm.rcp.app"
-            splashId="org.txm.rcp.AbstractSplashHandler2">
+            productId="org.txm.rcp.product"
+            splashId="org.txm.rcp.splashHandlers.TXMSplashHandler">
       </splashHandlerProductBinding>
    </extension>
    <extension
Index: TXM/trunk/org.txm.rcp/SUBVERSION
===================================================================
--- TXM/trunk/org.txm.rcp/SUBVERSION	(revision 0)
+++ TXM/trunk/org.txm.rcp/SUBVERSION	(revision 3292)
@@ -0,0 +1 @@
+beta
\ No newline at end of file
Index: TXM/trunk/org.txm.rcp/splash.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.internalview.core/src/org/txm/internalview/core/preferences/InternalViewPreferences.java
===================================================================
--- TXM/trunk/org.txm.internalview.core/src/org/txm/internalview/core/preferences/InternalViewPreferences.java	(revision 3291)
+++ TXM/trunk/org.txm.internalview.core/src/org/txm/internalview/core/preferences/InternalViewPreferences.java	(revision 3292)
@@ -41,5 +41,6 @@
 		preferences.put(UNIT_PROPERTIES, TBXPreferences.DEFAULT_UNIT_PROPERTY);
 		preferences.put(STRUCTURAL_UNIT_PROPERTIES, "");
 		preferences.putInt(CURRENT_PAGE, 0);
+		preferences.putInt(N_LINES_PER_PAGE, 100);
 	}
 }
\ No newline at end of file
Index: TXM/trunk/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java
===================================================================
--- TXM/trunk/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java	(revision 3291)
+++ TXM/trunk/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java	(revision 3292)
@@ -64,6 +64,12 @@
 	protected List<WordProperty> pWordProperties;
 	
 	/**
+	 * Word properties to display.
+	 */
+	@Parameter(key = TXMPreferences.N_LINES_PER_PAGE)
+	protected Integer pNumberOfLines;
+	
+	/**
 	 * Structural units to display.
 	 */
 	@Parameter(key = TXMPreferences.STRUCTURAL_UNIT_PROPERTIES)
@@ -151,7 +157,7 @@
 	@Override
 	protected boolean _compute(TXMProgressMonitor monitor) throws Exception {
 		
-		if (this.hasParameterChanged(InternalViewPreferences.STRUCTURAL_UNIT)) {
+		if (this.hasParameterChanged(InternalViewPreferences.STRUCTURAL_UNIT) || this.hasParameterChanged(InternalViewPreferences.N_LINES_PER_PAGE)) {
 			
 			// reset the current page (only if the result has been computed at least once otherwise it breaks the deserialization)
 			if (this.hasBeenComputedOnce()) {
@@ -183,7 +189,9 @@
 				pWordProperties != null &&
 				pWordProperties.size() > 0 &&
 				pStructuralUnitsProperties != null &&
-				pStructuralUnitsProperties.size() > 0;
+				pStructuralUnitsProperties.size() > 0  &&
+				pNumberOfLines != null &&
+				pNumberOfLines > 0;
 	}
 	
 	/**
@@ -199,10 +207,12 @@
 		if (i >= 0 && i < nmatches) {
 			Match m = matches.get(i);
 			Collection<? extends Integer> positions = m.getRange();
-			int[] p = new int[positions.size()];
+			int max = Math.min(positions.size(), pNumberOfLines);
+			int[] p = new int[max];
 			int c = 0;
 			for (int v : positions) {
 				p[c++] = v;
+				if (c == max) break;
 			}
 			for (Property prop : pWordProperties) {
 				rez.put(prop, Match.getValuesForProperty(prop, p));
@@ -469,4 +479,12 @@
 		return InternalViewCoreMessages.RESULT_TYPE;
 	}
 	
+/**
+ * its not exactly the number per page since there is no page :D 
+ * @return
+ */
+	public int getNLinesPerPage() {
+		return pNumberOfLines;
+	}
+	
 }
\ No newline at end of file
Index: TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/commands/ExportTEICorpus.java
===================================================================
--- TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/commands/ExportTEICorpus.java	(revision 3291)
+++ TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/commands/ExportTEICorpus.java	(revision 3292)
@@ -32,8 +32,13 @@
 
 	@Option(name="outputDirectory",usage="zip the result", widget="Folder", required=true, def="outputdir")
 	File outputDirectory;
+	
 	@Option(name="createArchive",usage="zip the result", widget="Boolean", required=true, def="true")
 	boolean createArchive;
+	
+	@Option(name="copyXMLTXMFiles",usage="Copy the XML Files in the 'texts' directory", widget="Boolean", required=true, def="false")
+	boolean copyXMLTXMFiles;
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
@@ -59,7 +64,7 @@
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						if (!export(true, outputDirectory, createArchive, monitor, mainCorpus, analecCorpus, vue)) {
+						if (!export(true, outputDirectory, createArchive, monitor, mainCorpus, analecCorpus, vue, copyXMLTXMFiles)) {
 							System.out.println(Messages.ExportTEICorpus_2);
 							return Status.CANCEL_STATUS;
 						} else {
@@ -81,7 +86,7 @@
 		return null;
 	}
 	
-	public static boolean export(boolean standoffAnnotations, File outputDirectory, boolean createArchive, IProgressMonitor monitor, MainCorpus mainCorpus, Corpus analecCorpus, Vue vue) throws Exception {
+	public static boolean export(boolean standoffAnnotations, File outputDirectory, boolean createArchive, IProgressMonitor monitor, MainCorpus mainCorpus, Corpus analecCorpus, Vue vue, boolean copyXMLTXMFiles) throws Exception {
 		String name = mainCorpus.getID();
 		File finalOutputDirectory = new File(outputDirectory, name);
 		int n = 2;
@@ -90,7 +95,7 @@
 			n++;
 		}
 		finalOutputDirectory.mkdirs();
-		URSAnnotationTEIExporter exporter = new URSAnnotationTEIExporter(monitor, finalOutputDirectory, mainCorpus, analecCorpus, vue);
+		URSAnnotationTEIExporter exporter = new URSAnnotationTEIExporter(monitor, finalOutputDirectory, mainCorpus, analecCorpus, vue, copyXMLTXMFiles);
 		boolean ret = exporter.process(standoffAnnotations, createArchive);
 		
 		return ret;
Index: TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/export/URSAnnotationTEIExporter.java
===================================================================
--- TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/export/URSAnnotationTEIExporter.java	(revision 3291)
+++ TXM/trunk/org.txm.analec.rcp/src/org/txm/annotation/urs/export/URSAnnotationTEIExporter.java	(revision 3292)
@@ -15,11 +15,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.txm.Toolbox;
+import org.txm.importer.PersonalNamespaceContext;
 import org.txm.importer.StaxIdentityParser;
-import org.txm.importer.PersonalNamespaceContext;
-import org.txm.rcp.Application;
-import org.txm.rcp.TxmPreferences;
 import org.txm.scripts.importer.StaxStackWriter;
 import org.txm.searchengine.cqp.CQPSearchEngine;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
@@ -55,6 +52,7 @@
 	protected Corpus analecCorpus;
 	protected Vue analecVue;
 	protected IProgressMonitor monitor;
+	protected boolean copyXMLTXMFiles = true;
 
 	/**
 	 * 
@@ -64,12 +62,13 @@
 	 * @param analecCorpus
 	 * @param analecVue
 	 */
-	public URSAnnotationTEIExporter(IProgressMonitor monitor, File outputDirectory, MainCorpus mainCorpus, Corpus analecCorpus, Vue analecVue) {
+	public URSAnnotationTEIExporter(IProgressMonitor monitor, File outputDirectory, MainCorpus mainCorpus, Corpus analecCorpus, Vue analecVue, boolean copyXMLTXMFiles) {
 		this.outputDirectory = outputDirectory;
 		this.mainCorpus = mainCorpus;
 		this.analecCorpus = analecCorpus;
 		this.analecVue = analecVue;
 		this.monitor = monitor;
+		this.copyXMLTXMFiles = copyXMLTXMFiles;
 	}
 
 	/**
@@ -81,6 +80,7 @@
 	 * @throws Exception
 	 */
 	public boolean process(boolean standoff, boolean createArchive) throws Exception {
+		
 		if (!standoff) {
 			System.out.println("Inligned annotations not implemented yet. Aborting");
 			return false;
@@ -182,9 +182,11 @@
 			return false;
 		}
 
-		if (!FileCopy.copy(xmltxmFileFromBin, xmltxmFile)) {
-			System.out.println("Error: could not copy the XML-TXM reference file: "+xmltxmFileFromBin);
-			return false;
+		if (copyXMLTXMFiles) {
+			if (!FileCopy.copy(xmltxmFileFromBin, xmltxmFile)) {
+				System.out.println("Error: could not copy the XML-TXM reference file: "+xmltxmFileFromBin);
+				return false;
+			}
 		}
 
 		XMLStreamWriter writer = null;
Index: TXM/trunk/org.txm.rcp.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.rcp.feature/feature.xml	(revision 3291)
+++ TXM/trunk/org.txm.rcp.feature/feature.xml	(revision 3292)
@@ -6,13 +6,13 @@
       provider-name="Textometrie.org"
       plugin="org.txm.rcp">
 
-   <description url="https://gitlab.huma-num.fr/txm/textometrie/files/software/TXM/0.8.2">
+   <description url="https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.2/welcome/">
       %description
    </description>
 
    <copyright url="http://www.example.com/copyright">
       TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+Copyright © 2013-2021 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
Index: TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java
===================================================================
--- TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java	(revision 3291)
+++ TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java	(revision 3292)
@@ -14,10 +14,13 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
@@ -30,6 +33,7 @@
 import org.txm.rcp.editors.TableKeyListener;
 import org.txm.rcp.editors.listeners.ComputeKeyListener;
 import org.txm.rcp.editors.listeners.ComputeSelectionListener;
+import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.swt.widget.NewNavigationWidget;
 import org.txm.rcp.swt.widget.PropertiesSelector;
 import org.txm.rcp.swt.widget.structures.StructuralUnitsComboViewer;
@@ -92,6 +96,11 @@
 	@Parameter(key = InternalViewPreferences.STRUCTURAL_UNIT_PROPERTIES)
 	protected PropertiesSelector<StructuralUnitProperty> structuralUnitPropertiesSelector;
 	
+	/**
+	 * Number of lines to display.
+	 */
+	@Parameter(key = InternalViewPreferences.N_LINES_PER_PAGE)
+	protected Spinner nLinesPerPagesSpinner;
 	
 	@Override
 	public void _createPartControl() {
@@ -104,7 +113,7 @@
 		
 		
 		Composite parametersArea = getExtendedParametersGroup();
-		parametersArea.setLayout(new GridLayout(5, false));
+		parametersArea.setLayout(new GridLayout(6, false));
 		parametersArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		
 		Composite resultPanel = getResultArea();
@@ -144,6 +153,12 @@
 		structuralUnitPropertiesSelector.setTitle(InternalViewUIMessages.structuralProperties);
 		structuralUnitPropertiesSelector.addSelectionListener(computeSelectionListener);
 		
+		new Label(parametersArea, SWT.NONE).setText(TXMUIMessages.numberOfLines);
+		nLinesPerPagesSpinner = new Spinner(parametersArea, SWT.NONE);
+		nLinesPerPagesSpinner.setMinimum(1);
+		nLinesPerPagesSpinner.setMaximum(Integer.MAX_VALUE);
+		nLinesPerPagesSpinner.addSelectionListener(computeSelectionListener);
+		nLinesPerPagesSpinner.addKeyListener(computeKeyListener);
 		
 		navigationPanel = getBottomToolbar().installGLComposite(InternalViewUIMessages.navigation, 4, false);
 		navigationPanel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
@@ -186,6 +201,7 @@
 			@Override
 			public Object[] getElements(Object inputElement) {
 				int nlines = internalView.getSegmentLength();
+				nlines = Math.min(nlines, internalView.getNLinesPerPage());
 				List<WordProperty> props = internalView.getProperties();
 				
 				ArrayList<Object[]> lines = new ArrayList<>();
@@ -360,6 +376,10 @@
 		
 		navigation.refresh();
 		navigationPanel.layout();
+		
+		if (internalView.getSegmentLength() > internalView.getNLinesPerPage()) {
+			Log.info(NLS.bind("Warning: the navigator table content has been cut to {0} (was {1}).", internalView.getNLinesPerPage(), internalView.getSegmentLength()));
+		}
 	}
 	
 	@Override
Index: TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/TrimTranscriptionMacro.groovy
===================================================================
--- TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/TrimTranscriptionMacro.groovy	(revision 3291)
+++ TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/TrimTranscriptionMacro.groovy	(revision 3292)
@@ -153,11 +153,11 @@
 	switch(node.name()) {
 		case "Turn":
 		case "Section":
-			node.@startTime = ""+value
+			node.@startTime = String.format("%0,.2f", value)
 			break;
 
 		case "Sync":
-			return node.@time = ""+value
+			return node.@time = String.format("%0,.2f", value)
 		default: break;
 	}
 }
@@ -186,11 +186,11 @@
 	switch(node.name()) {
 		case "Turn":
 		case "Section":
-			node.@endTime = ""+value
+			node.@endTime = String.format("%0,.2f", value)
 			break;
 
 		case "Sync":
-			return node.@time = ""+value
+			return node.@time = String.format("%0,.2f", value)
 		default: break;
 	}
 }
Index: TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZImporter.groovy
===================================================================
--- TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZImporter.groovy	(revision 3291)
+++ TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZImporter.groovy	(revision 3292)
@@ -237,7 +237,7 @@
 			for (File inputFile : filesToProcess) {
 				File outputFile = new File(inputFile.getParentFile(), "tmp"+inputFile.getName());
 				println "$inputFile, 'text', $wordTag, $milestone, $outputFile"
-				MileStoneProjection msp = new MileStoneProjection(inputFile, "text", wordTag, milestone)
+				MileStoneProjection msp = new MileStoneProjection(inputFile, null, wordTag, milestone)
 				if (!msp.process(outputFile)) {
 					println "** Fail to encode $milestone in $inputFile"
 					return false
Index: TXM/trunk/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java
===================================================================
--- TXM/trunk/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java	(revision 3291)
+++ TXM/trunk/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java	(revision 3292)
@@ -45,16 +45,9 @@
 import org.txm.edition.rcp.messages.EditionUIMessages;
 import org.txm.objects.Project;
 import org.txm.objects.Text;
-import org.txm.rcp.editors.TXMEditor;
 import org.txm.searchengine.cqp.corpus.CQPCorpus;
-import org.txm.searchengine.cqp.corpus.MainCorpus;
-import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.StructuralUnit;
-import org.txm.searchengine.cqp.corpus.Subcorpus;
-import org.txm.searchengine.cqp.corpus.query.Match;
 import org.txm.utils.logger.Log;
 
-// TODO: Auto-generated Javadoc
 /**
  * Open a text edition from: a main corpus : the first text of the maincorpus a
  * sub-corpus : the first text of the subcorpus a partition : the user must
Index: TXM/trunk/org.txm.core/src/java/org/txm/xml/xmltxm/XMLTXMWordPropertiesInjection.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/xml/xmltxm/XMLTXMWordPropertiesInjection.java	(revision 3291)
+++ TXM/trunk/org.txm.core/src/java/org/txm/xml/xmltxm/XMLTXMWordPropertiesInjection.java	(revision 3292)
@@ -73,9 +73,11 @@
 	 * 
 	 */
 	public void addProperty(String id, HashMap<String, String> properties) throws IOException, XMLStreamException {
-		if (rules != null) {
+		if (rules == null) {
 			setProperties(new HashMap<String, HashMap<String, String>>());
 		}
+		
+		rules.put(id,  properties);
 	}
 	
 	public HashSet<String> getNonActivatedRules() {
Index: TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/MileStoneProjection.groovy
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/MileStoneProjection.groovy	(revision 3291)
+++ TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/MileStoneProjection.groovy	(revision 3292)
@@ -1,13 +1,6 @@
 package org.txm.scripts.importer
 
-import java.io.File;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
-import java.net.URL;
 import javax.xml.stream.*;
-import org.txm.importer.filters.*;
-import org.txm.importer.PersonalNamespaceContext;
 import org.txm.importer.StaxIdentityParser
 
 /**
@@ -41,14 +34,14 @@
 		this.mileStoneTag = mileStoneTag
 		mileStoneID = mileStoneTag+"_0"
 		this.startTag = startTag
-		this.start = false;
+		this.start = (startTag == null);
 		
 		msIdAttributeName = mileStoneTag+"id";
 		msStartAttributeName = mileStoneTag+"start";
 		msEndAttributeName = mileStoneTag+"end";
 		
 		fetchMilestoneLengths();
-		start = false // reset
+		this.start = (startTag == null);
 	}
 	
 	public void fetchMilestoneLengths() {
@@ -85,13 +78,16 @@
 		super.processStartElement();
 		
 		if (start && localname.equals(mileStoneTag)) {
+			//println "START MILESTONE"
 			mileStoneDistance = 0
+			//println parser
 			mileStoneID = parser.getAttributeValue(null, "id")
 			if (mileStoneID == null) mileStoneID = parser.getAttributeValue("xml", "id");
 			if (mileStoneID == null) mileStoneID = "0";
 			
 			milestonesCounter++;
 		} else if (start && localname.equals(wordTag)) {
+			//println "START W"
 			// println "end of $milestonesCounter len="+milestonesLength[milestonesCounter]+" dist="+mileStoneDistance
 			writer.writeAttribute(msEndAttributeName, Integer.toString((milestonesLength[milestonesCounter] - mileStoneDistance - 1)))
 			writer.writeAttribute(msStartAttributeName, Integer.toString(mileStoneDistance))
@@ -104,10 +100,10 @@
 	}
 	
 	public static void main(String[] args) {
-		File inputFile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XTZMILESTONES/tokenized/test.xml")
-		File outputFile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XTZMILESTONES/tokenized/result.xml")
+		File inputFile = new File(System.getProperty("user.home"), "runtime-rcpapplication.product/corpora/XTZMILESTONES2/tokenized/test.xml")
+		File outputFile = new File(System.getProperty("user.home"), "runtime-rcpapplication.product/corpora/XTZMILESTONES2/tokenized/result.xml")
 		
-		MileStoneProjection msp = new MileStoneProjection(inputFile, "text", "w", "lb");
+		MileStoneProjection msp = new MileStoneProjection(inputFile, null, "w", "lb");
 		println "Sucess: "+msp.process(outputFile)
 	}
 }
