Merge branch '5.1' of git@git.scilab.org:scilab into 5.15.1

34 files changed, 223 insertions, 274 deletions

diff --git a/scilab/RELEASE_NOTES_5.1.X b/scilab/RELEASE_NOTES_5.1.X
index 2276e9c..31c574c 100644
--- a/scilab/RELEASE_NOTES_5.1.X
+++ b/scilab/RELEASE_NOTES_5.1.X
@@ -11,7 +11,7 @@
         
 - input('xxx') from Scipad (bug #2578):
   The function input('xxx') called from scipad is crashing Scilab.
-  Due to internal issues, this bug
+  This bug is due to internal issues and will be fixed in a future version.
 
 - Scipad Debugger:
   The Scipad debugger is still broken because of code reorganization that has
diff --git a/scilab/modules/fileio/tests/nonreg_tests/bug_4097.dia.ref b/scilab/modules/fileio/tests/nonreg_tests/bug_4097.dia.ref
new file mode 100644
index 0000000..d2ab0b3
--- /dev/null
+++ b/scilab/modules/fileio/tests/nonreg_tests/bug_4097.dia.ref
@@ -0,0 +1,24 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Pierre MARECHAL
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- JVM NOT MANDATORY -->
+// <-- Non-regression test for bug 4097 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=4097
+//
+// <-- Short Description -->
+// fscanfMat() crashes Scilab. It doesn't occur with scilab-5.0.3
+n  = 50;
+a  = rand(n,n,"u");
+fd = mopen(TMPDIR+"/bug_4097.mat","w");
+for i=1:n ,
+  for j=1:n, mfprintf(fd,"%5.2f ",a(i,j));end;
+  mfprintf(fd,'\n');
+end
+mclose(fd);
+b = fscanfMat(TMPDIR+"/bug_4097.mat");
+if size(b)<> [50,50] then bugmes();quit;end
diff --git a/scilab/modules/fileio/tests/nonreg_tests/bug_4097.tst b/scilab/modules/fileio/tests/nonreg_tests/bug_4097.tst
new file mode 100644
index 0000000..2c94191
--- /dev/null
+++ b/scilab/modules/fileio/tests/nonreg_tests/bug_4097.tst
@@ -0,0 +1,31 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Pierre MARECHAL
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- JVM NOT MANDATORY -->
+
+// <-- Non-regression test for bug 4097 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=4097
+//
+// <-- Short Description -->
+// fscanfMat() crashes Scilab. It doesn't occur with scilab-5.0.3
+
+n  = 50;
+a  = rand(n,n,"u");
+fd = mopen(TMPDIR+"/bug_4097.mat","w");
+
+for i=1:n ,
+  for j=1:n, mfprintf(fd,"%5.2f ",a(i,j));end;
+  mfprintf(fd,'\n');
+end
+
+mclose(fd);
+
+b = fscanfMat(TMPDIR+"/bug_4097.mat");
+
+if size(b)<> [50,50] then pause,end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4081.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_4081.tst
new file mode 100644
index 0000000..1667296
--- /dev/null
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4081.tst
@@ -0,0 +1,45 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008-2008 - Digiteo - Jean-Baptiste Silvy
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- INTERACTIVE TEST -->
+
+// <-- Non-regression test for bug 4081 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=4081
+//
+// <-- Short Description -->
+// Colormap is sometime not updated when using new interpoated colors.
+
+
+clf()
+f=gcf();
+a=gca();a.data_bounds=[0,-10;40,30];
+x1=[0,10,20,10]';
+y1=[10,0,10,20]';
+c=linspace(2,100,4)';
+xpols=[x1 x1+20 x1+10 x1+10];
+ypols=[y1 y1    y1+10 y1-10];
+cols= [c c($:-1:1) c([3 4 1 2]) c]
+f.color_map=jetcolormap(max(cols));
+xfpolys(xpols,ypols,cols)
+// interpolated colors
+clf()
+f=gcf();
+x11=[0;20;20;0];y11=[10;10;30;30];c11=[10;10;30;30];
+x12=x11;y12=y11+20;c12=[20;20;1;1];c12=[30;30;10;10];
+x21=[0;30;30;0]+22;y21=[20;20;30;30];c21=[20;20;30;30];
+x22=x21;y22=y21+10;c22=[30;30;20;20];
+x31=[0;40;40;0]+55;y31=[0;0;30;30];c31=[0;0;30;30];
+x32=x31;y32=y31+30;c32=[30;30;0;0];
+X=[x11 x12 x21 x22 x31 x32];Y=[y11 y12 y21 y22 y31 y32];C=([c11 c12 c21 c22  c31 c32]+1)*5;
+a=gca();
+a.data_bounds=[min(X),min(Y);max(X),max(Y)];
+f=gcf();f.color_map=graycolormap(max(C));
+xfpolys(X,Y,C)
+
+// the rectangles should be gray and not using the jetcolormap
diff --git a/scilab/modules/gui/locales/fr_FR/gui.po b/scilab/modules/gui/locales/fr_FR/gui.po
index c8b2f18..7cc3ea2 100644
--- a/scilab/modules/gui/locales/fr_FR/gui.po
+++ b/scilab/modules/gui/locales/fr_FR/gui.po
@@ -867,7 +867,7 @@ msgid ""
 msgstr ""
 "disp(\"ATTENTION : A cause des limitations de votre configuration, Scilab "
 "est passé dans un mode dans lequel mélanger des uicontrols et des graphiques "
-"n'est pas possible. Tapez \"\"help usecanvas\"\" pour plus d'information.\")"
+"n''est pas possible. Tapez \"\"help usecanvas\"\" pour plus d''information.\")"
 
 msgid ""
 "disp(\"WARNING: Due to your video card drivers limitations, that are not "
@@ -885,7 +885,7 @@ msgid ""
 msgstr ""
 "disp(\"ATTENTION : Malgré notre avertissement précédent, vous avez choisi "
 "d'utiliser Scilab avec des fonctionnalités graphiques avancées. Tapez "
-"\"\"help usecanvas\"\" pour plus d'information.\")"
+"\"\"help usecanvas\"\" pour plus d''information.\")"
 
 msgid "Loading help browser..."
 msgstr "Chargement du navigateur d'aide..."
diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_438.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_438.dia.ref
index 408ea07..cdca5d5 100644
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_438.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_438.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 438 -->
 //
 // <-- Bugzilla URL -->
@@ -27,5 +28,5 @@ dummy3 =sprintf('%e', 10000);
 if MSDOS then
   if dummy3 <> "1.000000e+004" then bugmes();quit;end
 else
-  if dummy2 <> "1.000000e+04" then bugmes();quit;end
+  if dummy3 <> "1.000000e+04" then bugmes();quit;end
 end
diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_438.tst b/scilab/modules/output_stream/tests/nonreg_tests/bug_438.tst
index 1331b91..864ab56 100644
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_438.tst
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_438.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 438 -->
 //
 // <-- Bugzilla URL -->
@@ -31,5 +33,5 @@ dummy3 =sprintf('%e', 10000);
 if MSDOS then
   if dummy3 <> "1.000000e+004" then pause, end
 else
-  if dummy2 <> "1.000000e+04" then pause, end
+  if dummy3 <> "1.000000e+04" then pause, end
 end  
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_201.dia.ref b/scilab/modules/polynomials/tests/nonreg_tests/bug_201.dia.ref
index f63df18..e4e1842 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_201.dia.ref
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_201.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 201 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_201.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_201.tst
index b3d5939..61b936c 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_201.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_201.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 201 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_205.dia.ref b/scilab/modules/polynomials/tests/nonreg_tests/bug_205.dia.ref
index ecdc847..0137f6f 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_205.dia.ref
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_205.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 205 -->
 //
 // <-- Bugzilla URL -->
@@ -27,6 +28,7 @@
 //
 //    Gaubert on Linux PPC version 2.2.13 distribution  with  X/kde as window manager
 //    France  February 10, 2001 at 11:55:40
+// <-- ENGLISH IMPOSED -->
 N = 30;
 A = rand(N,N);
 s = poly(0,'s');
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_205.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_205.tst
index 6166614..99d876b 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_205.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_205.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 205 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.dia.ref b/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.dia.ref
index 5555d3c..c48aae5 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.dia.ref
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.dia.ref
@@ -1,3 +1,10 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2007-2008 - INRIA - Serge STEER <serge.steer@inria.fr>
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 2264 -->
 //
 // <-- Bugzilla URL -->
@@ -5,9 +12,6 @@
 //
 // <-- Short Description -->
 //    lcm gives wrong value for 3-element vectors(cf bug 666)
-// Serge Steer - Scilab Project
-// Copyright INRIA
-// 2 janv 2007
 [q,fact]=lcm(int32([-6 5 7 12 4]));
 if q<>int32(420) then bugmes();quit;end
 [q,fact]=lcm(int32([6 5 7 3 4])) ;
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.tst
index 9566369..2b36a08 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2264.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 2264 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.dia.ref b/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.dia.ref
index ed3169a..ec24522 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.dia.ref
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 2391 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.tst
index a65c6df..2d60ef6 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2391.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 2391 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.dia.ref b/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.dia.ref
index 37605b1..c32048d 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.dia.ref
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 2492 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.tst
index 3d96dc0..0f3278d 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2492.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 2492 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.dia.ref b/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.dia.ref
index f0062e8..4956357 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.dia.ref
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 2834 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.tst
index 9cd951f..8be272a 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_2834.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 2834 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.dia.ref b/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.dia.ref
index 01958cc..18e7917 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.dia.ref
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 // <-- Non-regression test for bug 3006 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.tst
index 4943449..9e8f72c 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_3006.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // <-- Non-regression test for bug 3006 -->
 //
 // <-- Bugzilla URL -->
diff --git a/scilab/modules/polynomials/tests/nonreg_tests/bug_415.tst b/scilab/modules/polynomials/tests/nonreg_tests/bug_415.tst
index 0ddb017..029c93c 100644
--- a/scilab/modules/polynomials/tests/nonreg_tests/bug_415.tst
+++ b/scilab/modules/polynomials/tests/nonreg_tests/bug_415.tst
@@ -5,7 +5,7 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
-
+// <-- JVM NOT MANDATORY -->
 
 // <-- NO CHECK REF -->
 // <-- Non-regression test for bug 415 -->
diff --git a/scilab/modules/polynomials/tests/unit_tests/polelm.dia.ref b/scilab/modules/polynomials/tests/unit_tests/polelm.dia.ref
index c326b64..935c574 100644
--- a/scilab/modules/polynomials/tests/unit_tests/polelm.dia.ref
+++ b/scilab/modules/polynomials/tests/unit_tests/polelm.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 //poly (coeff)
 v=[1 2 3];nam='s';job='c';p=1+2*%s+3*%s^2;
 if poly(v,'s','c')<>p then bugmes();quit;end
diff --git a/scilab/modules/polynomials/tests/unit_tests/polelm.tst b/scilab/modules/polynomials/tests/unit_tests/polelm.tst
index cba4ed3..8ac7874 100644
--- a/scilab/modules/polynomials/tests/unit_tests/polelm.tst
+++ b/scilab/modules/polynomials/tests/unit_tests/polelm.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 //poly (coeff)
 
 v=[1 2 3];nam='s';job='c';p=1+2*%s+3*%s^2;
diff --git a/scilab/modules/polynomials/tests/unit_tests/polops.dia.ref b/scilab/modules/polynomials/tests/unit_tests/polops.dia.ref
index f0f4d33..df0d543 100644
--- a/scilab/modules/polynomials/tests/unit_tests/polops.dia.ref
+++ b/scilab/modules/polynomials/tests/unit_tests/polops.dia.ref
@@ -4,6 +4,7 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
 mode(5)
 lines(0)
 s=poly(0,'s');
diff --git a/scilab/modules/polynomials/tests/unit_tests/polops.tst b/scilab/modules/polynomials/tests/unit_tests/polops.tst
index 4f1dc55..e632eca 100644
--- a/scilab/modules/polynomials/tests/unit_tests/polops.tst
+++ b/scilab/modules/polynomials/tests/unit_tests/polops.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 mode(5)
 lines(0)
 s=poly(0,'s');
diff --git a/scilab/modules/polynomials/tests/unit_tests/poly_roots.dia.ref b/scilab/modules/polynomials/tests/unit_tests/poly_roots.dia.ref
index 204e41a..15bb5a2 100644
--- a/scilab/modules/polynomials/tests/unit_tests/poly_roots.dia.ref
+++ b/scilab/modules/polynomials/tests/unit_tests/poly_roots.dia.ref
@@ -4,6 +4,15 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
+// <-- JVM NOT MANDATORY -->
+// poly_roots.tst --
+//   Check the computation of the roots of a polynomial
+//   with different kinds of polynomials and different
+//   kinds of roots :
+//   - real poly,
+//   - complex poly,
+//   - real roots,
+//   - complex roots.
 //roots : 3 real roots -> RPOLY
 p=-6+11*%s-6*%s^2+%s^3;
 myroots=roots(p);
@@ -76,6 +85,22 @@ myroots=roots(p,"e");
 computedroots = sort(myroots);
 expectedroots  = [%pi;%pi];
 if (abs(computedroots-expectedroots)>10*%eps) then bugmes();quit;end
+//
+// Caution !
+// The following are difficult root-finding problems
+// with expected precision problems.
+// See "Principles for testing polynomial
+// zerofinding programs"
+// Jenkins, Traub
+// 1975
+// p.28
+// "The accuracy which one may expect to achieve in calculating
+// zeros is limited by the condition of these zeros. In particular,
+// for multiple zeros perturbations of size epsilon in the
+// coefficients cause perturbations of size epsilon^(1/m)
+// in the zeros."
+//
+//
 // 3 real roots with a zero derivate at the root -> RPOLY
 // *** PRECISION PROBLEM : only simple precision computed, instead of double precision ***
 p=(%s-%pi)^3
diff --git a/scilab/modules/polynomials/tests/unit_tests/poly_roots.tst b/scilab/modules/polynomials/tests/unit_tests/poly_roots.tst
index 70a18d1..2b22f1a 100644
--- a/scilab/modules/polynomials/tests/unit_tests/poly_roots.tst
+++ b/scilab/modules/polynomials/tests/unit_tests/poly_roots.tst
@@ -5,6 +5,8 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
+// <-- JVM NOT MANDATORY -->
+
 // poly_roots.tst --
 //   Check the computation of the roots of a polynomial
 //   with different kinds of polynomials and different 
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/TexturedColorMap.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/TexturedColorMap.java
index 8626d57..3a97a02 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/TexturedColorMap.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/TexturedColorMap.java
@@ -152,7 +152,7 @@ public class TexturedColorMap extends ColorMap {
          * @return The buffered image used to draw the texture
          */
         private BufferedImage getImage() {
-                if (textureImage == null) {
+                if (textureImage == null || hasChanged) {
                         // create a new image
                         int colorMapSize = getSize();
                         textureImage = new BufferedImage(colorMapSize + 2, 1, BufferedImage.TYPE_INT_RGB);
@@ -193,7 +193,6 @@ public class TexturedColorMap extends ColorMap {
          * @return a new texture data.
          */
         private TextureData createTextureData() {
-                textureImage = null;
                 return getTextureData();
         }
         
diff --git a/scilab/modules/scicos/tests/unit_tests/lincos.tst b/scilab/modules/scicos/tests/unit_tests/lincos.tst
index 10766a5..75f120e 100644
--- a/scilab/modules/scicos/tests/unit_tests/lincos.tst
+++ b/scilab/modules/scicos/tests/unit_tests/lincos.tst
@@ -1,6 +1,16 @@
-exec(fullfile(SCI,'modules','scicos','tests','unit_tests','PENDULUM_ANIM.sci'))
-exec(fullfile(SCI,'modules','scicos','tests','unit_tests','anim_pen.sci'))
-load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'))
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+// Copyright (C) 2009 - DIGITEO
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- ENGLISH IMPOSED -->
+
+exec(fullfile(SCI,'modules','scicos','tests','unit_tests','PENDULUM_ANIM.sci'));
+exec(fullfile(SCI,'modules','scicos','tests','unit_tests','anim_pen.sci'));
+load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'));
 M=10;
 m=3;
 l=3;
diff --git a/scilab/modules/scicos/tests/unit_tests/lincos.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/lincos.unix.dia.ref
index 28e12ac..1c275d9 100644
--- a/scilab/modules/scicos/tests/unit_tests/lincos.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/lincos.unix.dia.ref
@@ -1,120 +1,12 @@
- 
-///withoutPrompt
- 
-function [x,y,typ]=PENDULUM_ANIM(job,arg1,arg2)
-// Animation of the cart-pendulum problem
-  x=[];y=[];typ=[]
-  select job
-   case 'plot' then
-    standard_draw(arg1)
-   case 'getinputs' then
-    [x,y,typ]=standard_inputs(o)
-   case 'getoutputs' then
-    x=[];y=[];typ=[];
-   case 'getorigin' then
-    [x,y]=standard_origin(arg1)
-   case 'set' then
-    x=arg1;
-    graphics=arg1.graphics;exprs=graphics.exprs
-    model=arg1.model;dstate=model.dstate
-    while %t do
-      [ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=getvalue(..
-        'Set Scope parameters',..
-        ['pendulum length';'cart size (square side)';'slope';
-        'Xmin';'Xmax';  'Ymin'; 'Ymax'; ],..
-        list('vec',1,'vec',1,'vec',1,'vec',1,'vec',1,'vec',1,'vec',1),exprs)
-      if ~ok then break,end
-      mess=[]
-      if plen<=0|csiz<=0 then
-        mess=[mess;'Pendulum lenght and cart size must be positive.';' ']
-        ok=%f
-      end
-      if ymin>=ymax then
-        mess=[mess;'Ymax must be greater than Ymin';' ']
-        ok=%f
-      end
-      if xmin>=xmax then
-        mess=[mess;'Xmax must be greater than Xmin';' ']
-        ok=%f
-      end
-      if ~ok then
-        message(mess)
-      else
-        rpar=[plen;csiz;phi;xmin;xmax;ymin;ymax]
-        model.rpar=rpar;
-        graphics.exprs=exprs;
-        x.graphics=graphics;x.model=model
-        break
-      end
-    end
-   case 'define' then
-    plen=2; csiz=2; phi=0;
-    xmin=-5;xmax=5;ymin=-5;ymax=5
-    model=scicos_model()
-    model.sim=list('anim_pen',5)
-    model.in=[1;1]
-    model.evtin=1
-    model.dstate=0
-    model.rpar=[plen;csiz;phi;xmin;xmax;ymin;ymax]
-    model.blocktype='d'
-    model.dep_ut=[%f %f]
-    exprs=string(model.rpar)
-    gr_i=['thick=xget(''thickness'');xset(''thickness'',2);';
-          'xx=orig(1)+sz(1)*[.4 .6 .6 .4 .4]'
-          'yy=orig(2)+sz(2)*[.2 .2 .4 .4 .2]'
-          'xpoly(xx,yy,''lines'')'
-          'xx=orig(1)+sz(1)*[.5 .6]'
-          'yy=orig(2)+sz(2)*[.4 .8]'
-          'xpoly(xx,yy)'
-          'xset(''thickness'',thick);']
-    x=standard_define([3 3],model,exprs,gr_i)
-  end
-endfunction
- 
- 
- 
-///withoutPrompt
- 
-function [blocks] = anim_pen(blocks,flag)
-  win=20000+curblock()
-  if flag<>4 then H=scf(win), end
-  xold=blocks.z
-  rpar=blocks.rpar
-  plen=rpar(1);csiz=rpar(2);phi=rpar(3);
-  if flag==4 then
-    xset("window",win)
-    set("figure_style","new")
-    H=scf(win)
-    clf(H)
-    H.pixmap='on'
-    Axe=H.children
-    Axe.data_bounds=rpar(4:7)
-    Axe.isoview='on'
-    S=[cos(phi),-sin(phi);sin(phi),cos(phi)]
-    XY=S*[rpar(4),rpar(5);-csiz/2,-csiz/2]
-    xsegs(XY(1,:),XY(2,:))
-    x=0;theta=0;
-    x1=x-csiz/2;x2=x+csiz/2;y1=-csiz/2;y2=csiz/2
-    XY=S*[x1 x2 x2 x1 x1;y1,y1,y2,y2,y1]
-    xpoly(XY(1,:),XY(2,:),"lines",1)
-    XY=S*[x,x+plen*sin(theta);0,0+plen*cos(theta)]
-    xsegs(XY(1,:),XY(2,:))
-  elseif flag==2 then
-    Axe=H.children
-    x=blocks.inptr(1)(1)
-    theta=blocks.inptr(2)(1)
-    XY=Axe.children(2).data'+..
-       [cos(phi)*(x-xold);sin(phi)*(x-xold)]*ones(1,5)
-    Axe.children(2).data=XY'
-    x1=x*cos(phi);y1=x*sin(phi)
-    XY=[x1,x1+plen*sin(theta);y1,y1+plen*cos(theta)]
-    Axe.children(1).data=XY'
-    blocks.z=x
-    show_pixmap()
-  end
-endfunction
- 
-load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'))
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+// Copyright (C) 2009 - DIGITEO
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- ENGLISH IMPOSED -->
+load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'));
 M=10;
 m=3;
 l=3;
diff --git a/scilab/modules/scicos/tests/unit_tests/steadycos.tst b/scilab/modules/scicos/tests/unit_tests/steadycos.tst
index 3085191..cdc0356 100644
--- a/scilab/modules/scicos/tests/unit_tests/steadycos.tst
+++ b/scilab/modules/scicos/tests/unit_tests/steadycos.tst
@@ -1,6 +1,16 @@
-exec(fullfile(SCI,'modules','scicos','tests','unit_tests','PENDULUM_ANIM.sci'))
-exec(fullfile(SCI,'modules','scicos','tests','unit_tests','anim_pen.sci'))
-load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'))
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+// Copyright (C) 2009 - DIGITEO
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- ENGLISH IMPOSED -->
+
+exec(fullfile(SCI,'modules','scicos','tests','unit_tests','PENDULUM_ANIM.sci'));
+exec(fullfile(SCI,'modules','scicos','tests','unit_tests','anim_pen.sci'));
+load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'));
 M=10;
 m=3;
 l=3;
diff --git a/scilab/modules/scicos/tests/unit_tests/steadycos.unix.dia.ref b/scilab/modules/scicos/tests/unit_tests/steadycos.unix.dia.ref
index 09286ec..f97d02f 100644
--- a/scilab/modules/scicos/tests/unit_tests/steadycos.unix.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/steadycos.unix.dia.ref
@@ -1,120 +1,12 @@
- 
-///withoutPrompt
- 
-function [x,y,typ]=PENDULUM_ANIM(job,arg1,arg2)
-// Animation of the cart-pendulum problem
-  x=[];y=[];typ=[]
-  select job
-   case 'plot' then
-    standard_draw(arg1)
-   case 'getinputs' then
-    [x,y,typ]=standard_inputs(o)
-   case 'getoutputs' then
-    x=[];y=[];typ=[];
-   case 'getorigin' then
-    [x,y]=standard_origin(arg1)
-   case 'set' then
-    x=arg1;
-    graphics=arg1.graphics;exprs=graphics.exprs
-    model=arg1.model;dstate=model.dstate
-    while %t do
-      [ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=getvalue(..
-        'Set Scope parameters',..
-        ['pendulum length';'cart size (square side)';'slope';
-        'Xmin';'Xmax';  'Ymin'; 'Ymax'; ],..
-        list('vec',1,'vec',1,'vec',1,'vec',1,'vec',1,'vec',1,'vec',1),exprs)
-      if ~ok then break,end
-      mess=[]
-      if plen<=0|csiz<=0 then
-        mess=[mess;'Pendulum lenght and cart size must be positive.';' ']
-        ok=%f
-      end
-      if ymin>=ymax then
-        mess=[mess;'Ymax must be greater than Ymin';' ']
-        ok=%f
-      end
-      if xmin>=xmax then
-        mess=[mess;'Xmax must be greater than Xmin';' ']
-        ok=%f
-      end
-      if ~ok then
-        message(mess)
-      else
-        rpar=[plen;csiz;phi;xmin;xmax;ymin;ymax]
-        model.rpar=rpar;
-        graphics.exprs=exprs;
-        x.graphics=graphics;x.model=model
-        break
-      end
-    end
-   case 'define' then
-    plen=2; csiz=2; phi=0;
-    xmin=-5;xmax=5;ymin=-5;ymax=5
-    model=scicos_model()
-    model.sim=list('anim_pen',5)
-    model.in=[1;1]
-    model.evtin=1
-    model.dstate=0
-    model.rpar=[plen;csiz;phi;xmin;xmax;ymin;ymax]
-    model.blocktype='d'
-    model.dep_ut=[%f %f]
-    exprs=string(model.rpar)
-    gr_i=['thick=xget(''thickness'');xset(''thickness'',2);';
-          'xx=orig(1)+sz(1)*[.4 .6 .6 .4 .4]'
-          'yy=orig(2)+sz(2)*[.2 .2 .4 .4 .2]'
-          'xpoly(xx,yy,''lines'')'
-          'xx=orig(1)+sz(1)*[.5 .6]'
-          'yy=orig(2)+sz(2)*[.4 .8]'
-          'xpoly(xx,yy)'
-          'xset(''thickness'',thick);']
-    x=standard_define([3 3],model,exprs,gr_i)
-  end
-endfunction
- 
- 
- 
-///withoutPrompt
- 
-function [blocks] = anim_pen(blocks,flag)
-  win=20000+curblock()
-  if flag<>4 then H=scf(win), end
-  xold=blocks.z
-  rpar=blocks.rpar
-  plen=rpar(1);csiz=rpar(2);phi=rpar(3);
-  if flag==4 then
-    xset("window",win)
-    set("figure_style","new")
-    H=scf(win)
-    clf(H)
-    H.pixmap='on'
-    Axe=H.children
-    Axe.data_bounds=rpar(4:7)
-    Axe.isoview='on'
-    S=[cos(phi),-sin(phi);sin(phi),cos(phi)]
-    XY=S*[rpar(4),rpar(5);-csiz/2,-csiz/2]
-    xsegs(XY(1,:),XY(2,:))
-    x=0;theta=0;
-    x1=x-csiz/2;x2=x+csiz/2;y1=-csiz/2;y2=csiz/2
-    XY=S*[x1 x2 x2 x1 x1;y1,y1,y2,y2,y1]
-    xpoly(XY(1,:),XY(2,:),"lines",1)
-    XY=S*[x,x+plen*sin(theta);0,0+plen*cos(theta)]
-    xsegs(XY(1,:),XY(2,:))
-  elseif flag==2 then
-    Axe=H.children
-    x=blocks.inptr(1)(1)
-    theta=blocks.inptr(2)(1)
-    XY=Axe.children(2).data'+..
-       [cos(phi)*(x-xold);sin(phi)*(x-xold)]*ones(1,5)
-    Axe.children(2).data=XY'
-    x1=x*cos(phi);y1=x*sin(phi)
-    XY=[x1,x1+plen*sin(theta);y1,y1+plen*cos(theta)]
-    Axe.children(1).data=XY'
-    blocks.z=x
-    show_pixmap()
-  end
-endfunction
- 
-load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'))
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+// Copyright (C) 2009 - DIGITEO
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- ENGLISH IMPOSED -->
+load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'));
 M=10;
 m=3;
 l=3;
diff --git a/scilab/modules/shell/src/c/others/zzledt.c b/scilab/modules/shell/src/c/others/zzledt.c
index 96b0541..e7bd5c3 100644
--- a/scilab/modules/shell/src/c/others/zzledt.c
+++ b/scilab/modules/shell/src/c/others/zzledt.c
@@ -817,7 +817,6 @@ static void TermCompletionOnFiles(char **dictionaryFiles, int sizedictionaryFile
                                                 if (new_line[l-1] == '.') strcat(new_line, &(dictionaryFiles[0][1]));
                                                 else if (ptr_strrchar1) strcat(new_line, ptr_strrchar1);
 
-
                                                 CopyLineAtPrompt(wk_buf, new_line, cursor, cursor_max);
                                                 FREE(new_line);
                                                 return;
@@ -847,23 +846,15 @@ static void TermCompletionOnFiles(char **dictionaryFiles, int sizedictionaryFile
                                 if (ptr_strrchar1) 
                                 {
                                         char *ptr_strrchar2 = NULL;
-                                        char *new_line = NULL;
                                         ptr_strrchar2 = strrstr(currentline, defaultPattern);
-                                        new_line = (char*)MALLOC(sizeof(char)*(strlen(currentline)+ strlen(ptr_strrchar1)));
 
-                                        if (new_line)
-                                        {
-                                                int l = strlen(currentline)- strlen(ptr_strrchar2);
-                                                if (l < 0) l = 0 - l;
+                                        int l = strlen(currentline)- strlen(ptr_strrchar2);
+                                        if (l < 0) l = 0 - l;
 
-                                                strncpy(new_line,currentline, l);
-                                                new_line[l] = '\0';
-                                                strcat(new_line, ptr_strrchar1);
-
-                                                CopyLineAtPrompt(wk_buf, new_line, cursor, cursor_max);
+                                        strncpy(wk_buf,currentline, l);
+                                        wk_buf[l] = '\0';
 
-                                                FREE(new_line);
-                                        }
+                                        CopyLineAtPrompt(wk_buf, strcat(wk_buf, ptr_strrchar1), cursor, cursor_max);
                                 }
                                 else
                                 {
@@ -977,19 +968,13 @@ static void TermCompletionOnAll(char *currentline, char *defaultPattern,
                                 {
                                         char *result = NULL;
                                         char *partResult = NULL;
-                                        char *new_line = NULL;
 
                                         result = commonAll;
                                         partResult = &result[strlen(defaultPattern)];
-                                        new_line = (char*)MALLOC(sizeof(char)*(strlen(currentline)+ strlen(partResult)));
 
-                                        if (new_line)
-                                        {
-                                                strcpy(new_line, currentline);
-                                                strcat(new_line,partResult);
-                                                CopyLineAtPrompt(wk_buf, new_line, cursor, cursor_max);
-                                                FREE(new_line);
-                                        }
+                                        strcpy(wk_buf, currentline);
+                                        CopyLineAtPrompt(wk_buf, strcat(wk_buf,partResult), cursor, cursor_max);
+
                                         FREE(commonAll);
                                         commonAll = NULL;
                                 }