bug 5339

30 files changed, 58 insertions, 260 deletions

diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index 58a5e48..bb60f7c 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -85,6 +85,8 @@ Bug fixes:
 
 * bug 5330 fixed - "help str1 str2" returned a error.
 
+* bug 5339 fixed - some macros had multiple definitions.
+
                Changes between version 5.1.1 and 5.2.0-beta1 of Scilab
                =======================================================
 
diff --git a/scilab/modules/compatibility_functions/macros/%b_g_s.sci b/scilab/modules/compatibility_functions/macros/%b_g_s.sci
deleted file mode 100644
index 84c4526..0000000
--- a/scilab/modules/compatibility_functions/macros/%b_g_s.sci
+++ /dev/null
@@ -1,13 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ???? - INRIA - Scilab 
-// 
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at    
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-function r=%b_g_s(a,b)
-// r=a|b
-r=a|(b<>0)
-endfunction
diff --git a/scilab/modules/compatibility_functions/macros/%b_h_s.sci b/scilab/modules/compatibility_functions/macros/%b_h_s.sci
deleted file mode 100644
index 3c4f1a4..0000000
--- a/scilab/modules/compatibility_functions/macros/%b_h_s.sci
+++ /dev/null
@@ -1,13 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ???? - INRIA - Scilab 
-// 
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at    
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-function r=%b_h_s(a,b)
-// r=a&b
-r=a&(b<>0)
-endfunction
diff --git a/scilab/modules/compatibility_functions/macros/%s_g_b.sci b/scilab/modules/compatibility_functions/macros/%s_g_b.sci
deleted file mode 100644
index 068bed7..0000000
--- a/scilab/modules/compatibility_functions/macros/%s_g_b.sci
+++ /dev/null
@@ -1,13 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ???? - INRIA - Scilab 
-// 
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at    
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-function r=%s_g_b(a,b)
-// r=a|b
-r=(a<>0)|b
-endfunction
diff --git a/scilab/modules/compatibility_functions/macros/%s_h_b.sci b/scilab/modules/compatibility_functions/macros/%s_h_b.sci
deleted file mode 100644
index 75ff9b1..0000000
--- a/scilab/modules/compatibility_functions/macros/%s_h_b.sci
+++ /dev/null
@@ -1,13 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ???? - INRIA - Scilab 
-// 
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at    
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-function r=%s_h_b(a,b)
-// r=a&b
-r=(a<>0)&b
-endfunction
diff --git a/scilab/modules/differential_equations/demos/bike/bike1.dem.sce b/scilab/modules/differential_equations/demos/bike/bike1.dem.sce
index b708e72..b5c65b6 100644
--- a/scilab/modules/differential_equations/demos/bike/bike1.dem.sce
+++ b/scilab/modules/differential_equations/demos/bike/bike1.dem.sce
@@ -7,7 +7,7 @@
 
 thispath = get_absolute_file_path("bike1.dem.sce");
 
-exec(thispath+"macros/show.sci");
+exec(thispath+"macros/bike_show.sci");
 exec(thispath+"macros/velod.sci");
 exec(thispath+"macros/velodp.sci");
 exec(thispath+"macros/velo2.sci");
@@ -17,7 +17,7 @@ x = read(thispath+"data/x1.dat",46,368,"(e10.4)");
 my_handle = scf(100001);
 clf(my_handle,"reset");
 
-show(x(:,300:368),1,1,velo4p);
+bike_show(x(:,300:368),1,1,velo4p);
 
 // Clear variable and functions
-clear x show get_velo_rti velo1 velo4p poteau arbre velodp velod;
+clear x bike_show get_velo_rti velo1 velo4p poteau arbre velodp velod;
diff --git a/scilab/modules/differential_equations/demos/bike/bike2.dem.sce b/scilab/modules/differential_equations/demos/bike/bike2.dem.sce
index f339a7f..6a2e1af 100644
--- a/scilab/modules/differential_equations/demos/bike/bike2.dem.sce
+++ b/scilab/modules/differential_equations/demos/bike/bike2.dem.sce
@@ -7,7 +7,7 @@
 
 thispath = get_absolute_file_path("bike2.dem.sce");
 
-exec(thispath+"macros/show.sci");
+exec(thispath+"macros/bike_show.sci");
 exec(thispath+"macros/velod.sci");
 exec(thispath+"macros/velo1.sci");
 
@@ -16,8 +16,8 @@ x = read(thispath+"data/xdemo.dat",46,401,"(e10.4)");
 my_handle = scf(100001);
 clf(my_handle,"reset");
 
-show(x(:,1:340),1.6,1.47,velo1);
+bike_show(x(:,1:340),1.6,1.47,velo1);
 
 // Clear variable and functions
 clear my_axe x;
-clear show get_velo_rti velo1 velo4p poteau arbre velodp velod;
+clear bike_show get_velo_rti velo1 velo4p poteau arbre velodp velod;
diff --git a/scilab/modules/differential_equations/demos/bike/macros/show.sci b/scilab/modules/differential_equations/demos/bike/macros/bike_show.sci
index 97759d3..d51825b 100644
--- a/scilab/modules/differential_equations/demos/bike/macros/show.sci
+++ b/scilab/modules/differential_equations/demos/bike/macros/bike_show.sci
@@ -5,8 +5,8 @@
 // This file is distributed under the same license as the Scilab package.
 //
 
-function []=show(xx,t,p,f_name)
-//[]=show(xx,t,p,[f_name])
+function []=bike_show(xx,t,p,f_name)
+//[]=bike_show(xx,t,p,[f_name])
 // Just show the bike evolution
 // t and p are the spherical angles of the observation point
 // given in radian
diff --git a/scilab/modules/differential_equations/demos/wheel/Readme.txt b/scilab/modules/differential_equations/demos/wheel/Readme.txt
index 1dbf1a8..294a3a4 100644
--- a/scilab/modules/differential_equations/demos/wheel/Readme.txt
+++ b/scilab/modules/differential_equations/demos/wheel/Readme.txt
@@ -7,7 +7,7 @@ To run the demo (assuming that your working directory is SCIDIR/demos/wheel2);
 3. Enter the command "show(x)" in Scilab for plotting the wheel.
 
 Also you can use the macro wheel (file "wheel.sci") to compute x and 
-plot the results by the macro show (file "show.sci").
+plot the results by the macro show (file "wheel_show.sci").
 
 The fortran files (bigmat.f, constr.f, inigrd.f) are automatically
 generated by Maple: Invoke Maple and input the command `read roue.ex`:
diff --git a/scilab/modules/differential_equations/demos/wheel/wheel1.dem.sce b/scilab/modules/differential_equations/demos/wheel/wheel1.dem.sce
index a531ca1..e3d97be 100644
--- a/scilab/modules/differential_equations/demos/wheel/wheel1.dem.sce
+++ b/scilab/modules/differential_equations/demos/wheel/wheel1.dem.sce
@@ -14,12 +14,12 @@ clf(my_handle,"reset");
 // A precomputed value for
 // x0=[0;%pi/2+0.1;0;5.0;0.0;4.0;0;0];
 
-exec(thispath+"show.sci");
+exec(thispath+"wheel_show.sci");
 x=read(thispath+"x.wrt",8,301);
 
 wheelg=wheelgs;
-show(x);
+wheel_show(x);
 
 // Clear variable and functions
 clear wheelg wheelgs;
-clear show wheeld test_wheel wheel_build_and_load get_wheel_rti;
+clear wheel_show wheeld test_wheel wheel_build_and_load get_wheel_rti;
diff --git a/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce b/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce
index b1bd5cf..7db14b3 100644
--- a/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce
+++ b/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce
@@ -11,7 +11,7 @@ thispath = get_absolute_file_path("wheel2.dem.sce");
 my_handle = scf(100001);
 clf(my_handle,"reset");
 
-exec(thispath+"show.sci");
+exec(thispath+"wheel_show.sci");
 
 if ~(haveacompiler()) then
         messagebox(["Scilab doesn''t find a C compiler","This demo is disabled"],"modal");
@@ -44,7 +44,7 @@ x0=[0;             // theta
 x=ode(x0,tmin,times,"wheel");
 
 clf(my_handle,"reset");
-show(x);
+wheel_show(x);
 
 ystr = [ 'phi';'theta';'psi';'Dpsi';'Dtheta';'Dpsi';'x';'y'];
 flag = 2;
@@ -64,4 +64,4 @@ end
 // =========================================================================
 
 clear wheelg wheelgf tmin tmax nn times x0 x ystr flag;
-clear show wheeld test_wheel wheel_build_and_load get_wheel_rti;
+clear wheel_show wheeld test_wheel wheel_build_and_load get_wheel_rti;
diff --git a/scilab/modules/differential_equations/demos/wheel/show.sci b/scilab/modules/differential_equations/demos/wheel/wheel_show.sci
index fee8fd2..516d537 100644
--- a/scilab/modules/differential_equations/demos/wheel/show.sci
+++ b/scilab/modules/differential_equations/demos/wheel/wheel_show.sci
@@ -6,7 +6,7 @@
 // This file is distributed under the same license as the Scilab package.
 //
 
-function []=show(xx,t,p)
+function []=wheel_show(xx,t,p)
         
         //[]=show(xx,t,p)
         // Just show the wheel evolution 
diff --git a/scilab/modules/overloading/macros/%r_p.sci b/scilab/modules/overloading/macros/%r_p.sci
index ee8142f..420dc24 100644
--- a/scilab/modules/overloading/macros/%r_p.sci
+++ b/scilab/modules/overloading/macros/%r_p.sci
@@ -8,6 +8,11 @@
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
 function %r_p(h)
+
+if with_texmacs() then
+  texout(h);
+else
+
 //used to display rational fraction with complex coefficients
 //The real case is hard coded
 if size(size(h),'*')>2 then
@@ -71,7 +76,10 @@ while %t
   if width==[] then break,end
 end
 
+end
+
 endfunction
+
 function txt=p2str(p)
 //form display of a single polynomial with complex coefficients
 lparen='('
diff --git a/scilab/modules/scicos/demos/anim_pen.sci b/scilab/modules/scicos/demos/anim_pen.sci
deleted file mode 100644
index e90ec1a..0000000
--- a/scilab/modules/scicos/demos/anim_pen.sci
+++ /dev/null
@@ -1,46 +0,0 @@
-function [blocks] = anim_pen(blocks,flag)
-//** 7 Jan 2009 : updated for Scilab 5.x 
-  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);
-  
-  //** INIT 
-  if flag==4 then 
-    H = scf(win)
-    clf(H)
-    
-    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]
-    
-    drawlater(); 
-      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,:));
-    drawnow(); 
-  
-  //** UPDATE   
-  elseif flag==2 then
-    Axe = H.children
-    x = blocks.inptr(1)(1)
-    theta = blocks.inptr(2)(1)
-    drawlater(); 
-      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 ; 
-    drawnow(); 
-  end
-endfunction
diff --git a/scilab/modules/scicos/demos/go_pend_5.sci b/scilab/modules/scicos/demos/go_pend_5.sci
index 0b62abc..1d10b49 100644
--- a/scilab/modules/scicos/demos/go_pend_5.sci
+++ b/scilab/modules/scicos/demos/go_pend_5.sci
@@ -1,4 +1,4 @@
-getf PENDULUM_ANIM.sci
-getf anim_pen.sci
+exec("SCI/modules/xcos/demos/PENDULUM_ANIM.sci");
+exec("SCI/modules/xcos/demos/anim_pen.sci");
 scicos ("pendulum_anim45.cos");
 
diff --git a/scilab/modules/scicos/demos/inv_pend_anim.dem.sce b/scilab/modules/scicos/demos/inv_pend_anim.dem.sce
index ea23532..fbec6c8 100644
--- a/scilab/modules/scicos/demos/inv_pend_anim.dem.sce
+++ b/scilab/modules/scicos/demos/inv_pend_anim.dem.sce
@@ -5,12 +5,9 @@
 // This file is distributed under the same license as the Scilab package.
 //
 
-thispath = get_absolute_file_path("inv_pend_anim.dem.sce");
-exec(thispath+"/PENDULUM_ANIM.sci");
-exec(thispath+"/anim_pen.sci");
-
-//scicos_demostration(thispath+"/pendulum_anim5.cosf");
+exec("SCI/modules/xcos/demos/PENDULUM_ANIM.sci");
+exec("SCI/modules/xcos/demos/anim_pen.sci");
 
 // Open the cosf file with xcos
-xcos(thispath+"/pendulum_anim5.cosf");
-clear thispath;
+xcos("SCI/modules/scicos/demos/pendulum_anim5.cosf");
+
diff --git a/scilab/modules/scicos/demos/inverted_pendulum.dem.sce b/scilab/modules/scicos/demos/inverted_pendulum.dem.sce
index 96b2e0a..bd3e619 100644
--- a/scilab/modules/scicos/demos/inverted_pendulum.dem.sce
+++ b/scilab/modules/scicos/demos/inverted_pendulum.dem.sce
@@ -5,11 +5,8 @@
 // This file is distributed under the same license as the Scilab package.
 //
 
-thispath = get_absolute_file_path("inverted_pendulum.dem.sce");
-exec (thispath+"/setw.sci");
-
-//scicos_demostration(thispath+"/Inverted_pendulum.cosf");
+exec ("SCI/modules/xcos/demos/setw.sci");
 
 // Open the cosf file with xcos
-xcos(thispath+"/Inverted_pendulum.cosf");
-clear thispath;
+xcos("SCI/modules/scicos/demos/Inverted_pendulum.cosf");
+
diff --git a/scilab/modules/scicos/demos/scicos.dem b/scilab/modules/scicos/demos/scicos.dem
index d0a1bf3..7795f64 100644
--- a/scilab/modules/scicos/demos/scicos.dem
+++ b/scilab/modules/scicos/demos/scicos.dem
@@ -41,7 +41,7 @@ while %t do
   case 'Discrete-Kalman Filter' then
    scicos('SCI/modules/scicos/demos/Discrete-KalmanFilter.cosf');
   case 'Inverted Pendulum' then
-   exec (SCI+'/modules/scicos/demos/setw.sci');
+   exec (SCI+'/modules/xcos/demos/setw.sci');
    scicos('SCI/modules/scicos/demos/Inverted_pendulum.cos');
   case 'Lorentz attractor' then
    scicos('SCI/modules/scicos/demos/Lorentz.cos');
diff --git a/scilab/modules/scicos/demos/setw.sci b/scilab/modules/scicos/demos/setw.sci
deleted file mode 100644
index f1f8eb6..0000000
--- a/scilab/modules/scicos/demos/setw.sci
+++ /dev/null
@@ -1,9 +0,0 @@
-function y=setw(x)
- mu=size(x,1)
- y(1:mu,1:mu)=0
- for j=1:mu
-     for i=1:mu-j+1
-         y(i,j)=x(i+j-1)
-     end
- end
-endfunction
\ No newline at end of file
diff --git a/scilab/modules/scicos/macros/scicos_utils/readc_.sci b/scilab/modules/scicos/macros/scicos_utils/readc_.sci
deleted file mode 100644
index f70a6fc..0000000
--- a/scilab/modules/scicos/macros/scicos_utils/readc_.sci
+++ /dev/null
@@ -1,35 +0,0 @@
-//  Scicos
-//
-//  Copyright (C) INRIA - METALAU Project <scicos@inria.fr>
-//
-// This program 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.
-//
-// This program 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 this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// See the file ./license.txt
-//
-
-function [c]=readc_(unit)
-//Syntaxes : c=readc_(unit)
-//           c=readc_()
-//
-//readc_ reads a character string 
-//This macro allows one to interrupt an exec file without pause;
-//the exec file stops until carrige return is made.
-//!
-//
-// Copyright INRIA
-[lhs,rhs]=argn(0);
-if rhs<=0 then unit=%io(1); end;
-c=read(unit,1,1,'(a)');
-endfunction
diff --git a/scilab/modules/scicos/tests/unit_tests/PENDULUM_ANIM.sci b/scilab/modules/scicos/tests/unit_tests/PENDULUM_ANIM.sci
index 2a8262a..133233c 100644
--- a/scilab/modules/scicos/tests/unit_tests/PENDULUM_ANIM.sci
+++ b/scilab/modules/scicos/tests/unit_tests/PENDULUM_ANIM.sci
@@ -16,7 +16,7 @@ function [x,y,typ]=PENDULUM_ANIM(job,arg1,arg2)
     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(..
+      [ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue(..
         'Set Scope parameters',..
         ['pendulum length';'cart size (square side)';'slope';
         'Xmin';'Xmax';  'Ymin'; 'Ymax'; ],..
diff --git a/scilab/modules/scicos/tests/unit_tests/anim_pen.sci b/scilab/modules/scicos/tests/unit_tests/anim_pen.sci
deleted file mode 100644
index e90ec1a..0000000
--- a/scilab/modules/scicos/tests/unit_tests/anim_pen.sci
+++ /dev/null
@@ -1,46 +0,0 @@
-function [blocks] = anim_pen(blocks,flag)
-//** 7 Jan 2009 : updated for Scilab 5.x 
-  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);
-  
-  //** INIT 
-  if flag==4 then 
-    H = scf(win)
-    clf(H)
-    
-    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]
-    
-    drawlater(); 
-      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,:));
-    drawnow(); 
-  
-  //** UPDATE   
-  elseif flag==2 then
-    Axe = H.children
-    x = blocks.inptr(1)(1)
-    theta = blocks.inptr(2)(1)
-    drawlater(); 
-      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 ; 
-    drawnow(); 
-  end
-endfunction
diff --git a/scilab/modules/scicos/tests/unit_tests/lincos.dia.ref b/scilab/modules/scicos/tests/unit_tests/lincos.dia.ref
index 301491c..43f5df0 100644
--- a/scilab/modules/scicos/tests/unit_tests/lincos.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/lincos.dia.ref
@@ -7,11 +7,11 @@
 // =============================================================================
 // <-- ENGLISH IMPOSED -->
 ilib_verbose(0);
-load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'));
+load("SCI/modules/scicos/tests/unit_tests/pendulum_anim45.cos");
 M=10;
 m=3;
 l=3;
-ph=0.1;
+ph=0.1; 
 scs_m = scs_m.objs(5).model.rpar;
 [X,U,Y,XP] = steadycos(scs_m,[],[],[],[],1,1:$);
  
diff --git a/scilab/modules/scicos/tests/unit_tests/lincos.tst b/scilab/modules/scicos/tests/unit_tests/lincos.tst
index 8eab260..b9e0e13 100644
--- a/scilab/modules/scicos/tests/unit_tests/lincos.tst
+++ b/scilab/modules/scicos/tests/unit_tests/lincos.tst
@@ -9,9 +9,9 @@
 // <-- ENGLISH IMPOSED -->
 ilib_verbose(0);
 
-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'));
+exec("SCI/modules/xcos/demos/PENDULUM_ANIM.sci");
+exec("SCI/modules/xcos/demos/anim_pen.sci");
+load("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.dia.ref b/scilab/modules/scicos/tests/unit_tests/steadycos.dia.ref
index 5e42a77..239ab9e 100644
--- a/scilab/modules/scicos/tests/unit_tests/steadycos.dia.ref
+++ b/scilab/modules/scicos/tests/unit_tests/steadycos.dia.ref
@@ -7,11 +7,11 @@
 // =============================================================================
 // <-- ENGLISH IMPOSED -->
 ilib_verbose(0);
-load(fullfile(SCI,'modules','scicos','tests','unit_tests','pendulum_anim45.cos'));
+load("SCI/modules/scicos/tests/unit_tests/pendulum_anim45.cos");
 M=10;
 m=3;
 l=3;
-ph=0.1;
+ph=0.1; 
 scs_m = scs_m.objs(5).model.rpar;
 [X,U,Y,XP] = steadycos(scs_m,[],[],[],[],1,1:$);
  
diff --git a/scilab/modules/scicos/tests/unit_tests/steadycos.tst b/scilab/modules/scicos/tests/unit_tests/steadycos.tst
index 1446372..91b888a 100644
--- a/scilab/modules/scicos/tests/unit_tests/steadycos.tst
+++ b/scilab/modules/scicos/tests/unit_tests/steadycos.tst
@@ -10,9 +10,9 @@
 
 ilib_verbose(0);
 
-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'));
+exec("SCI/modules/xcos/demos/PENDULUM_ANIM.sci");
+exec("SCI/modules/xcos/demos/anim_pen.sci");
+load("SCI/modules/scicos/tests/unit_tests/pendulum_anim45.cos");
 M=10;
 m=3;
 l=3;
diff --git a/scilab/modules/signal_processing/macros/wfir.sci b/scilab/modules/signal_processing/macros/wfir.sci
index 2fc263e..9dae9d8 100644
--- a/scilab/modules/signal_processing/macros/wfir.sci
+++ b/scilab/modules/signal_processing/macros/wfir.sci
@@ -44,14 +44,14 @@ if rhs<=0 then,
   flag=0;
   select nc
   case 1 then //low pass
-    [ok,fl,forder]=getvalue(gettext('Input filter characteristics'),..
+    [ok,fl,forder]=scicos_getvalue(gettext('Input filter characteristics'),..
                     [gettext('cut-off frequency (0.<frequ<.5):');
                      gettext('filter length')],..
                     list('vec',1,'vec',1),[' ';' '])
     ftype='lp'
     fh=0;
   case 2 then //high pass
-    [ok,fl,forder]=getvalue(gettext('Input filter characteristics'),..
+    [ok,fl,forder]=scicos_getvalue(gettext('Input filter characteristics'),..
                     [gettext('cut-off frequency (0.<frequ<.5):');
                      gettext('filter length (odd value)')],..
                     list('vec',1,'vec',1),[' ';' '])
@@ -59,14 +59,14 @@ if rhs<=0 then,
     flag=1;
     ftype='hp'
   case 3 then //band pass
-    [ok,fl,fh,forder]=getvalue(gettext('Input filter characteristics'),..
+    [ok,fl,fh,forder]=scicos_getvalue(gettext('Input filter characteristics'),..
                     [gettext('low cut-off frequency (0.<flow<.5):');
                      gettext('high cut-off frequency (0.<flow<fhi<.5):');
                      gettext('filter length')],..
                     list('vec',1,'vec',1,'vec',1),[' ';' ';' '])
     ftype='bp'  
   case 4 then //stop band
-    [ok,fl,fh,forder]=getvalue(gettext('Input filter characteristics'),..
+    [ok,fl,fh,forder]=scicos_getvalue(gettext('Input filter characteristics'),..
                     [gettext('low cut-off frequency (0.<flow<.5):');
                      gettext('high cut-off frequency (0.<flow<fhi<.5):');
                      gettext('filter length (odd value)')],..
@@ -94,13 +94,13 @@ if rhs<=0 then,
   select nc
   case 1 then
     wtype='kr'
-    [ok,Beta]=getvalue(gettext('Input window characteristics'),..
+    [ok,Beta]=scicos_getvalue(gettext('Input window characteristics'),..
                      ['beta>0'],list('vec',1),' ')
     fpar(1)=Beta
     fpar(2)=0;
   case 2 then
     wtype='ch' 
-    [ok,name,value]=getvalue([gettext('Input window characteristics:');
+    [ok,name,value]=scicos_getvalue([gettext('Input window characteristics:');
              ' ';
              gettext('dp (dp>0)   : the maximum value of the window side-lobe height');
              gettext('df (0<df<.5): the width of the window main lobe')
diff --git a/scilab/modules/texmacs/macros/overloading/%r_p.sci b/scilab/modules/texmacs/macros/overloading/%r_p.sci
deleted file mode 100644
index 2584444..0000000
--- a/scilab/modules/texmacs/macros/overloading/%r_p.sci
+++ /dev/null
@@ -1,12 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA
-// 
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at    
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-function %r_p(a)
-texout(a)
-endfunction
diff --git a/scilab/modules/xcos/demos/inv_pend_anim.dem.sce b/scilab/modules/xcos/demos/inv_pend_anim.dem.sce
index bc890b2..d37c1be 100644
--- a/scilab/modules/xcos/demos/inv_pend_anim.dem.sce
+++ b/scilab/modules/xcos/demos/inv_pend_anim.dem.sce
@@ -7,10 +7,7 @@
 // This file is distributed under the same license as the Scilab package.
 //
 
-thispath = get_absolute_file_path("inv_pend_anim.dem.sce");
+exec("SCI/modules/xcos/demos/PENDULUM_ANIM.sci");
+exec("SCI/modules/xcos/demos/anim_pen.sci");
 
-exec(thispath+"/PENDULUM_ANIM.sci");
-exec(thispath+"/anim_pen.sci");
-
-xcos(thispath+"/pendulum_anim5.xcos");
-clear thispath;
+xcos("SCI/modules/xcos/demos/pendulum_anim5.xcos");
diff --git a/scilab/modules/xcos/demos/inverted_pendulum.dem.sce b/scilab/modules/xcos/demos/inverted_pendulum.dem.sce
index 55e1fbd..e1fa1d7 100644
--- a/scilab/modules/xcos/demos/inverted_pendulum.dem.sce
+++ b/scilab/modules/xcos/demos/inverted_pendulum.dem.sce
@@ -7,9 +7,6 @@
 // This file is distributed under the same license as the Scilab package.
 //
 
-thispath = get_absolute_file_path("inverted_pendulum.dem.sce");
+exec("SCI/modules/xcos/demos/setw.sci");
+xcos("SCI/modules/xcos/demos/Inverted_pendulum.xcos");
 
-exec(thispath+"/setw.sci");
-
-xcos(thispath+"/Inverted_pendulum.xcos");
-clear thispath;