[cleanup] symbolic functions references removed. 69/16869/5
Cedric Delamarre [Tue, 21 Jul 2015 13:56:00 +0000 (15:56 +0200)]
Change-Id: I549320ffe2c48ca943184771057977fff7eaa203

86 files changed:
scilab/CHANGES_6.0.X
scilab/modules/cacsd/macros/bloc2exp.sci [deleted file]
scilab/modules/cacsd/macros/solve.sci [deleted file]
scilab/modules/cacsd/macros/trianfml.sci [deleted file]
scilab/modules/cacsd/macros/trisolve.sci [deleted file]
scilab/modules/core/help/en_US/1_keywords/minus.xml
scilab/modules/core/help/en_US/1_keywords/plus.xml
scilab/modules/core/help/fr_FR/1_keywords/minus.xml
scilab/modules/core/help/fr_FR/1_keywords/plus.xml
scilab/modules/core/help/ja_JP/1_keywords/minus.xml
scilab/modules/core/help/ja_JP/1_keywords/plus.xml
scilab/modules/core/help/pt_BR/1_keywords/minus.xml
scilab/modules/core/help/pt_BR/1_keywords/plus.xml
scilab/modules/core/help/ru_RU/1_keywords/minus.xml
scilab/modules/core/help/ru_RU/1_keywords/plus.xml
scilab/modules/elementary_functions/help/en_US/signalprocessing/bloc2exp.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/signalprocessing/bloc2ss.xml
scilab/modules/elementary_functions/help/en_US/symbolic/CHAPTER [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/addf.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/cmb_lin.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/ldivf.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/mulf.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/rdivf.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/solve.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/subf.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/trianfml.xml [deleted file]
scilab/modules/elementary_functions/help/en_US/symbolic/trisolve.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/CHAPTER [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/addf.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/cmb_lin.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/ldivf.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/mulf.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/rdivf.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/solve.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/subf.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/trianfml.xml [deleted file]
scilab/modules/elementary_functions/help/fr_FR/symbolic/trisolve.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/signalprocessing/bloc2exp.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/signalprocessing/bloc2ss.xml
scilab/modules/elementary_functions/help/ja_JP/symbolic/addf.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/cmb_lin.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/ldivf.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/mulf.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/rdivf.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/solve.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/subf.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/trianfml.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/symbolic/trisolve.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/signalprocessing/bloc2exp.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/signalprocessing/bloc2ss.xml
scilab/modules/elementary_functions/help/pt_BR/symbolic/CHAPTER [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/addf.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/cmb_lin.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/ldivf.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/mulf.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/rdivf.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/solve.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/subf.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/trianfml.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/symbolic/trisolve.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/signalprocessing/bloc2exp.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/signalprocessing/bloc2ss.xml
scilab/modules/elementary_functions/help/ru_RU/symbolic/CHAPTER [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/addf.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/cmb_lin.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/ldivf.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/mulf.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/rdivf.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/solve.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/subf.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/trianfml.xml [deleted file]
scilab/modules/elementary_functions/help/ru_RU/symbolic/trisolve.xml [deleted file]
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/data/configuration/scilab_primitives.txt
scilab/modules/linear_algebra/macros/cmb_lin.sci [deleted file]
scilab/modules/scicos_blocks/macros/PDE/addf_mat.sci
scilab/modules/scicos_blocks/macros/PDE/addfv.sci
scilab/modules/scicos_blocks/macros/PDE/eval_pts_EF.sci
scilab/modules/scicos_blocks/macros/PDE/gen_code_FDM.sci
scilab/modules/scicos_blocks/macros/PDE/gen_code_FEM.sci
scilab/modules/scicos_blocks/macros/PDE/gen_code_FVM.sci
scilab/modules/scicos_blocks/macros/PDE/mulf3.sci
scilab/modules/scicos_blocks/macros/PDE/mulf_string.sci
scilab/modules/scicos_blocks/macros/PDE/mulfv.sci
scilab/modules/scicos_blocks/macros/PDE/subf_mat.sci
scilab/modules/scicos_blocks/macros/PDE/subfv.sci

index 1491888..ae393ac 100644 (file)
@@ -116,7 +116,7 @@ Removed functions
   - subf
   - trianfml
   - trisolve
-
+  - block2exp
 
 Removed functions (based on old Scilab stack)
 ==============================================
diff --git a/scilab/modules/cacsd/macros/bloc2exp.sci b/scilab/modules/cacsd/macros/bloc2exp.sci
deleted file mode 100644 (file)
index aa55284..0000000
+++ /dev/null
@@ -1,165 +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.1-en.txt
-
-
-function [h,name]=bloc2exp(syst,sexp)
-
-    [lhs,rhs]=argn(0)
-
-    if type(syst)<>15 then
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: A list expected.\n"),"bloc2exp",1));
-    end;
-    if syst(1)<>"blocd" then
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: A list expected.\n"),"bloc2exp",1));
-    end;
-    //inter%connection matrix
-    nsyst=size(syst)
-    for l=2:nsyst
-        sys=syst(l)
-        if sys(1)=="blocd" then
-            if rhs==1 then  sys=bloc2exp(sys)
-                syst(l)=list("transfer",sys)
-            else  [sys]=bloc2exp(sys,sexp)
-                syst(l)=list("transfer",sys(1))
-                sexp=sys(2)
-            end;
-        end;
-    end;
-    if lhs==2 then [t,nio,name]=construct(syst)
-    else [t,nio]=construct(syst)
-    end;
-    //linear equation
-    if rhs==1 then
-        t=trianfml(t)
-    else
-        [t,sexp]=trianfml(t,sexp)
-    end
-    [nt,mt]=size(t)
-    h=t(nt-nio(2)+1:nt,nt+1:mt)
-    for kt=1:nio(1),for lt=1:nio(2),
-            h(lt,kt)=mulf("-1",h(lt,kt))
-    end,end,
-    if rhs==1 then h=trisolve(t(nt-nio(2)+1:nt,nt-nio(2)+1:nt),h)
-    else [h,sexp]=trisolve(t(nt-nio(2)+1:nt,nt-nio(2)+1:nt),h,sexp)
-        h=list(h,sexp)
-    end;
-    if lhs==2 then name=list(name(nt+1:mt)',name(nt-nio(2)+1:nt)'),end,
-
-endfunction
-function [ab,nio,name]=construct(syst)
-    //!
-    [lhs,rhs]=argn(0)
-
-    [lboites,lliens,lentrees,lsorties]=blocdext(syst)
-    nio=[prod(size(lentrees)),prod(size(lsorties))]
-    lliens=[lliens,lsorties]
-    nlignes=prod(size(lliens))
-    ncols=nlignes+nio(1)
-    //
-    ab=string(0*ones(nlignes,ncols))
-    l=1;
-    for numero=lboites
-        //on ecrit les equations relatives a la boite "bloc" --> une ligne bloc de la
-        //matrice ab
-        bloc=syst(numero)
-        transfert=bloc(2);[no,ni]=size(transfert);
-        l1=l+no-1;
-        outint=out1(numero,lliens)
-        internes=%connect(numero,lliens);
-        externes=%connect(numero,lentrees);
-        for inti=internes
-            ni=prod(size(inti))
-            ab(l:l1,inti(1))=transfert(:,inti(2:ni))
-            ll=0;for iout=outint
-                ab(l-1+iout(2),iout(1))="-eye()"
-                ll=ll+1
-            end;
-        end;
-        for ext=externes
-            ne=prod(size(ext))
-            ab(l:l1,nlignes+ext(1))=transfert(:,ext(2:ne))
-            ll=0;for iout=outint
-                ab(l-1+iout(2),iout(1))="-eye()"
-                ll=ll+1
-            end;
-        end;
-        l=l1+1
-    end;
-    if lhs==1 then  return,end
-    name=[]
-    for kvar=[lliens,lentrees],
-        obj=syst(kvar)
-        name=[name,obj(2)]
-    end;
-
-endfunction
-function [lboites,lliens,lentrees,lsorties]=blocdext(syst)
-    //!
-    //
-    lboites=[]
-    lliens=[]
-    lentrees=[]
-    lsorties=[]
-    nsyst=size(syst)
-    for k=2:nsyst
-        obj=syst(k)
-        if type(obj)==15, if size(obj)>1 then
-                select obj(1)
-                case "transfer",
-                    lboites=[lboites,k]
-                case "link"
-                    obj2=obj(3)
-                    if obj2(1)>0 then
-                        nobj=size(obj)
-                        is_sortie=[]
-                        for ko=3:nobj
-                            objk=obj(ko)
-                            if objk(1)<0 then is_sortie=[is_sortie,-objk(1)],end
-                        end;
-                        if is_sortie==[] then lliens=[lliens,k],
-                        else lsorties(1,is_sortie)=k
-                        end;
-                    else lentrees(1,-obj2(1))=k,
-                    end;
-                else  error(msprintf(gettext("%s: Undefined type ''%s''.\n"),"bloc2exp",obj(1)))
-                end;
-        end,end
-    end;
-    if min(lsorties)==0 then
-        error(msprintf(gettext("%s: Some output(s) are undefined.\n"),"bloc2exp")),
-    end
-    if min(lentrees)==0 then
-        error(msprintf(gettext("%s: Some input(s) are undefined.\n"),"bloc2exp")),
-    end
-
-endfunction
-function [where_x]=%connect(bloc,lliens,syst)
-    where_x=list();nw=0
-    nliens=prod(size(lliens))
-    for l=1:nliens,
-        lien=syst(lliens(l));
-        nb=size(lien);
-        whi=l
-        for k=4:nb,
-            output=lien(k),
-            if bloc==output(1) then whi=[whi,output(2)],end;
-        end;
-        if prod(size(whi))>1 then nw=nw+1,where_x(nw)=whi,end
-    end;
-
-endfunction
-function [where_x]=out1(bloc,lliens,syst)
-    where_x=[];l=0;
-    for li=lliens
-        lien=syst(li)
-        nb=size(lien);l=l+1;
-        output=lien(3),
-        if bloc==output(1) then where_x=[where_x,[l;output(2)]],end;
-    end;
-endfunction
diff --git a/scilab/modules/cacsd/macros/solve.sci b/scilab/modules/cacsd/macros/solve.sci
deleted file mode 100644 (file)
index 6c89ed6..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA - F. Delebecque , Serge STEER
-//
-// 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.1-en.txt
-
-function x=solve(a,b)
-    // x=solve(A,b) solves A*x = b when A is an upper triagular matrix
-    // made of character strings.
-    //!
-
-    [na,ma]=size(a),[mb,nb]=size(b)
-    pivot=a(na,na);
-    if pivot<>"1" then
-        for k=1:nb,
-            x(1,k)=ldivf(pivot,b(na,k))
-        end
-    else
-        x=b(na,:)
-    end
-    // update
-    if na>1 then
-        for l=1:na-1,
-            pivot=mulf("-1",a(l,na))
-            for k=1:nb,
-                b(l,k)=addf(b(l,k),mulf(pivot,x(k)))
-            end
-        end
-        y=solve(a(1:na-1,1:na-1),b(1:na-1,:))
-        x=[y;x]
-    end
-endfunction
diff --git a/scilab/modules/cacsd/macros/trianfml.sci b/scilab/modules/cacsd/macros/trianfml.sci
deleted file mode 100644 (file)
index 9aa2118..0000000
+++ /dev/null
@@ -1,60 +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.1-en.txt
-
-function [f,sexp]=trianfml(f,sexp)
-    // [f [,sexp]]=trianfml(f [,sexp])  Triangularization of the symbolic matrix
-    // f ; Triangularization is performed by elementary row operations;
-    // sexp is a set of common expressions stored by the algorithm.
-    //!
-    //
-
-    [lhs,rhs]=argn(0)
-    [mf,nf]=size(f)
-    f_tra=f
-    //
-    // row loop
-    // ------------------------------
-    //
-    for nli=1:mf
-        //
-        [mf_tra,nf_tra]=size(f_tra)
-        //recherche du pivot  dans la premiere colonne
-        c1=f_tra(:,1);
-        lc=length(c1);[lc,klc]=gsort(lc);
-        pivot="0";l=mf_tra+1;
-        while (pivot=="0"&l>1),
-            l=l-1;
-            if c1(klc(l))<>"0" then pivot=c1(klc(l)),end,
-        end
-        if pivot<>"0" then
-            l=klc(l)
-            //
-            if l<>1 then f_tra([1 l],:)=f_tra([l 1],:);c1([1 l])=c1([l 1]);end
-            //
-            for k=2:mf_tra,
-                if c1(k)<>"0" then
-                    f_tra(k,:)=cmb_lin(pivot,f_tra(k,:),c1(k),f_tra(1,:))
-                    f_tra(k,1)="0"
-                    if rhs==2 then
-                        ns=prod(size(sexp)),
-                        for kl=2:nf_tra
-                            if length(f_tra(k,kl))>20 then
-                                ns=ns+1
-                                sexp(ns)=f_tra(k,kl)
-                                f_tra(k,kl)="%("+string(ns)+")"
-                            end;
-                        end;
-                    end;
-                end;
-            end;
-            f(mf-mf_tra+1:mf,nf-nf_tra+1:nf)=f_tra
-            f_tra=f_tra(2:mf_tra,2:nf_tra)
-        end
-    end;
-endfunction
diff --git a/scilab/modules/cacsd/macros/trisolve.sci b/scilab/modules/cacsd/macros/trisolve.sci
deleted file mode 100644 (file)
index a1d0396..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA - F. Delebecque , Serge STEER
-//
-// 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.1-en.txt
-
-function [b,sexp]=trisolve(a,b,sexp)
-    //[x [,sexp]] = trisolve(A,b [,sexp])  symbolically solves A*x =b
-    // when A and b are matrices of character strings, A being assumed to be
-    // upper triangular.
-    //sexp : vector of common subexpressions in A, b and x.
-    //!
-
-    [lhs,rhs]=argn(0)
-    [n0,m]=size(b)
-    if rhs==2 then
-        for n=n0:-1:1
-            pivot=a(n,n)
-            for k=1:m,b(n,k)=ldivf(pivot,"("+b(n,k)+")"),end
-            if n==1 then return,end
-            for l=1:n-1
-                for k=1:m,
-                    b(l,k)=addf(b(l,k),mulf(mulf("-1",a(l,n)),b(n,k)))
-                end
-            end
-        end
-    else
-        ns=prod(size(sexp))
-        for n=n0:-1:1
-            pivot=a(n,n)
-            for k=1:m,
-                ns=ns+1
-                sexp(ns)=ldivf(pivot,"("+b(n,k)+")")
-                b(n,k)="%("+string(ns)+")";
-            end
-            if n==1 then return,end
-            for l=1:n-1
-                for k=1:m,
-                    b(l,k)=addf(b(l,k),mulf(mulf("-1",a(l,n)),b(n,k)))
-                end
-            end
-        end
-    end
-endfunction
index 8bc3cce..2519bd0 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -57,7 +57,7 @@
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]-1
 []-2
 
@@ -69,9 +69,6 @@
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index 48f6644..28be1b9 100644 (file)
@@ -51,7 +51,7 @@
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]+1
 []+2
 s=poly(0,"s");
@@ -64,9 +64,6 @@ s+2
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index 33e2e5b..9fedd3a 100644 (file)
@@ -40,7 +40,7 @@
             Pour les opérandes numériques la signification est celle de la soustraction habituelle. Si l'un des opérandes est une matrice (ou un vecteur) et l'autre un scalaire l'opération est effectuée pour chaque élément de la matrice. Si <literal>Y==[]</literal> le résultat est <literal>X</literal>. Si <literal>X==[]</literal> le résultat est <literal>-Y</literal>.
         </para>
         <para>
-            La soustraction peut être aussi définie pour d'autres types de données via 
+            La soustraction peut être aussi définie pour d'autres types de données via
             la surcharge d'opérateurs (voir <link linkend="overloading">overloading</link>).
         </para>
     </refsection>
@@ -59,9 +59,6 @@
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index a4bd4c9..19cdfc0 100644 (file)
     <refsection>
         <title>Description</title>
         <para>
-            Addition. 
+            Addition.
         </para>
         <para>
             Pour des opérandes numériques l'addition a la signification habituelle.
-            Si l'un des opérandes est une matrice et l'autre un scalaire, ce dernier est ajouté à tous les termes de la matrice. Si l'un des opérandes est une matrice vide, le résultat est égal à l'autre opérande (ce comportement par défaut peut être modifié avec <literal>mtlb_mode</literal>). 
+            Si l'un des opérandes est une matrice et l'autre un scalaire, ce dernier est ajouté à tous les termes de la matrice. Si l'un des opérandes est une matrice vide, le résultat est égal à l'autre opérande (ce comportement par défaut peut être modifié avec <literal>mtlb_mode</literal>).
         </para>
         <para>
             Pour les chaînes de caractères <literal>+</literal> désigne la concaténation.
@@ -49,7 +49,7 @@
     </refsection>
     <refsection>
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]+1
 []+2
 s=poly(0,"s");
@@ -62,9 +62,6 @@ s+2
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index 2634f7d..3580d4a 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
         <para>
             減算は,"ソフトコードされた"演算により他のデータ型についても
             定義できます
-           (<link linkend="overloading">オーバーローディング</link>参照).
+            (<link linkend="overloading">オーバーローディング</link>参照).
         </para>
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]-1
 []-2
 
@@ -72,9 +72,6 @@
         <title>参照</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index c290511..ad6e41e 100644 (file)
@@ -7,8 +7,8 @@
     <refsynopsisdiv>
         <title>呼出し手順</title>
         <synopsis>
-         X+Y
-          str1+str2
+            X+Y
+            str1+str2
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -18,8 +18,8 @@
                 <term>X,Y</term>
                 <listitem>
                     <para>
-                        数値,多項式または有理数のスカラーまたはベクトルまたは行列. 
-                       <literal>syslin</literal> リストとすることも可能
+                        数値,多項式または有理数のスカラーまたはベクトルまたは行列.
+                        <literal>syslin</literal> リストとすることも可能
                     </para>
                 </listitem>
             </varlistentry>
@@ -55,7 +55,7 @@
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]+1
 []+2
 s=poly(0,"s");
@@ -68,9 +68,6 @@ s+2
         <title>参照</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index 3d339b6..b5ed7a5 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -57,7 +57,7 @@
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]-1
 []-2
 
@@ -70,9 +70,6 @@
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
         </simplelist>
index c6d6414..fe85779 100644 (file)
@@ -47,7 +47,7 @@
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]+1
 []+2
 s=poly(0,"s");
@@ -60,9 +60,6 @@ s+2
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index 9814ef9..50aa7ad 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
         <para>Вычитание</para>
         <para>
             Для числовых операндов вычитание имеет своё обычное значение. Если один из операндов
-            является матрицей, а другой -- скаляр, то операция выполняется поэлементно. 
-            Для <literal>X - Y</literal>, если <literal>Y==[]</literal>, то возвращается значение <literal>X</literal>; 
+            является матрицей, а другой -- скаляр, то операция выполняется поэлементно.
+            Для <literal>X - Y</literal>, если <literal>Y==[]</literal>, то возвращается значение <literal>X</literal>;
             если <literal>X==[]</literal>, то возвращается значение <literal>-Y</literal>.
         </para>
         <para>
-            Вычитание может быть также определено для других типов данных через "запрограммированные" 
+            Вычитание может быть также определено для других типов данных через "запрограммированные"
             операции (см. <link linkend="overloading">перегрузку</link>).
         </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]-1
 []-2
+
 %s-2
 1/%s-2
  ]]></programlisting>
@@ -71,9 +71,6 @@
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
index 24a2b43..2413467 100644 (file)
             Суммирование.
         </para>
         <para>
-            Для числовых операндов суммирование имеет свой обычный смысл. Если один из операндов является 
-            матрицей, а другой -- скаляр, то скаляр добавляется к каждому элементу матрицы. Если один из 
-            операндов является пустой матрицей, то возвращается второй операнд (это поведение по умолчанию, 
+            Для числовых операндов суммирование имеет свой обычный смысл. Если один из операндов является
+            матрицей, а другой -- скаляр, то скаляр добавляется к каждому элементу матрицы. Если один из
+            операндов является пустой матрицей, то возвращается второй операнд (это поведение по умолчанию,
             но его можно изменить с помощью функции <literal>mtlb_mode</literal>).
         </para>
         <para>
             Для символьных строк <literal>+</literal> означает конкатенацию.
         </para>
         <para>
-            Суммирование может быть также определено для других типов данных через "запрограммированные" 
+            Суммирование может быть также определено для других типов данных через "запрограммированные"
             операции (см. <link linkend="overloading">перегрузку</link>).
         </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [1,2]+1
 []+2
 s=poly(0,"s");
@@ -64,9 +64,6 @@ s+2
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
                 <link linkend="mtlb_mode">mtlb_mode</link>
             </member>
             <member>
diff --git a/scilab/modules/elementary_functions/help/en_US/signalprocessing/bloc2exp.xml b/scilab/modules/elementary_functions/help/en_US/signalprocessing/bloc2exp.xml
deleted file mode 100644 (file)
index f2590b5..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- *
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="bloc2exp" xml:lang="en">
-    <refnamediv>
-        <refname>bloc2exp</refname>
-        <refpurpose>Conversion of a block-diagram to its symbolic expression</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[str]=bloc2exp(blocd)
-            [str,names]=bloc2exp(blocd)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>blocd</term>
-                <listitem>
-                    <para>list</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>str</term>
-                <listitem>
-                    <para>string</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>names</term>
-                <listitem>
-                    <para>string</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>given a block-diagram representation of a linear system
-            <literal>bloc2exp</literal> returns its symbolic evaluation. The first
-            element of the list <literal>blocd</literal> must be the string
-            <literal>'blocd'</literal>. Each other element of this list
-            <literal>(blocd(2),blocd(3),...)</literal> is itself a list of one the
-            following types :
-        </para>
-        <programlisting><![CDATA[
-list('transfer','name_of_linear_system')
- ]]></programlisting>
-        <programlisting><![CDATA[
-list('link','name_of_link',
-               [number_of_upstream_box,upstream_box_port],
-               [downstream_box_1,downstream_box_1_portnumber],
-               [downstream_box_2,downstream_box_2_portnumber],
-               ...)
- ]]></programlisting>
-        <para>
-            The strings <literal>'transfer'</literal> and
-            <literal>'link'</literal> are keywords which indicate the type of element
-            in the block diagram.
-        </para>
-        <para>Case 1 : the second parameter of the list is a character string
-            which may refer (for a possible further evaluation) to the Scilab name of
-            a linear system given in state-space representation
-            (<literal>syslin</literal> list) or in transfer form (matrix of
-            rationals).
-        </para>
-        <para>To each transfer block is associated an integer. To each input and
-            output of a transfer block is also associated its number, an integer (see
-            examples)
-        </para>
-        <para>Case 2 : the second kind of element in a block-diagram
-            representation is a link. A link links one output of a block represented
-            by the pair <literal>[number_of_upstream_box,upstream_box_port]</literal>,
-            to different inputs of other blocks. Each such input is represented by the
-            pair
-            <literal>[downstream_box_i,downstream_box_i_portnumber]</literal>.
-        </para>
-        <para>The different elements of a block-diagram can be defined in an
-            arbitrary order.
-        </para>
-        <para>For example</para>
-        <para>
-            [1] <literal>S1*S2</literal> with unit feedback.
-        </para>
-        <para>
-            There are 3 transfers <literal>S1</literal> (number
-            <literal>n_s1=2</literal>) , <literal>S2</literal> (number
-            <literal>n_s2=3</literal>) and an adder (number
-            <literal>n_add=4</literal>) with symbolic transfer function
-            <literal>['1','1']</literal>.
-        </para>
-        <para>
-            There are 4 links. The first one (named <literal>'U'</literal>)
-            links the input (port 0 of fictitious block -1, omitted) to port 1 of the
-            adder. The second and third one link respectively (output)port 1 of the
-            adder to (input)port 1 of system <literal>S1</literal>, and (output)port 1
-            of <literal>S1</literal> to (input)port 1 of <literal>S2</literal>. The
-            fourth link (named <literal>'Y'</literal>) links (output) port 1 of
-            <literal>S2</literal> to the output (port 0 of fictitious block -1,
-            omitted) and to (input)port 2 of the adder.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-//Initialization
-syst=list('blocd'); l=1;
-
-//Systems
-l=l+1;n_s1=l;syst(l)=list('transfer','S1');  //System 1
-l=l+1;n_s2=l;syst(l)=list('transfer','S2');  //System 2
-l=l+1;n_adder=l;syst(l)=list('transfer',['1','1']);  //adder
-
-//Links
-
-// Inputs  -1 --> input 1
-l=l+1;syst(l)=list('link','U',[-1],[n_adder,1]);
-// Internal 
-l=l+1;syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
-l=l+1;syst(l)=list('link',' ',[n_s1,1],[n_s2,1]);
-
-// Outputs // -1 -> output 1
-l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
-
-//Evaluation call
-w=bloc2exp(syst);
- ]]></programlisting>
-        <para>The result is the character string:
-            <literal>w=-(s2*s1-eye())\s2*s1</literal>.
-        </para>
-        <para>
-            Note that invoked with two output arguments, <literal>[str,names]=
-                blocd(syst)
-            </literal>
-            returns in <literal>names</literal> the list of
-            symbolic names of named links. This is useful to set names to inputs and
-            outputs.
-        </para>
-        <programlisting role="example"><![CDATA[ 
-//Initialization
-syst=list('blocd'); l=1;
-
-//System (2x2 blocks plant)
-l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']);  
-
-//Controller
-l=l+1;n_k=l;syst(l)=list('transfer','k'); 
-
-//Links
-l=l+1;syst(l)=list('link','w',[-1],[n_s,1]);
-l=l+1;syst(l)=list('link','z',[n_s,1],[-1]);
-l=l+1;syst(l)=list('link','u',[n_k,1],[n_s,2]);
-l=l+1;syst(l)=list('link','y',[n_s,2],[n_k,1]);
-
-//Evaluation call
-w=bloc2exp(syst);
- ]]></programlisting>
-        <para>In this case the result is a formula equivalent to the usual
-            one:
-        </para>
-        <para>
-            <literal>P11+P12*invr(eye()-K*P22)*K*P21;</literal>
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="bloc2ss">bloc2ss</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 870548f..9fd80dd 100644 (file)
@@ -3,11 +3,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA - Serge STEER
  * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- * 
+ *
  * 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
             be the string <literal>'blocd'</literal>. Each other element of this list
             is itself a list of one the following types :
         </para>
-        <programlisting><![CDATA[ 
+        <programlisting><![CDATA[
 list('transfer','name_of_linear_system')
  ]]></programlisting>
-        <programlisting><![CDATA[  
+        <programlisting><![CDATA[
 list('link','name_of_link',
              [number_of_upstream_box,upstream_box_port],
              [downstream_box_1,downstream_box_1_portnumber],
@@ -104,7 +104,7 @@ list('link','name_of_link',
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Initialization
 syst=list('blocd'); l=1;
 
@@ -124,7 +124,7 @@ syst(l)=list('transfer',['1','1']);  //adder
 l=l+1;
 syst(l)=list('link','U1',[-1],[n_adder,1]);
 
-// Internal 
+// Internal
 l=l+1;
 syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
 l=l+1;
@@ -140,7 +140,7 @@ syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
             state-space representation for <literal>1/(s^2+s-1)</literal>.
         </para>
         <para>[2] LFT example</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Initialization
 syst=list('blocd');
 l=1;
@@ -148,13 +148,13 @@ l=1;
 //System (2x2 blocks plant)
 l=l+1;
 n_s=l;
-syst(l)=list('transfer',['P11','P12';'P21','P22']); 
+syst(l)=list('transfer',['P11','P12';'P21','P22']);
+
 //Controller
 l=l+1;
 n_k=l;
 syst(l)=list('transfer','k');
+
 //Links
 l=l+1;
 syst(l)=list('link','w',[-1],[n_s,1]);
@@ -166,23 +166,19 @@ l=l+1;
 syst(l)=list('link','y',[n_s,2],[n_k,1]);
  ]]></programlisting>
         <para>With</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 A=[0,1;0,0];
 B=[1;1];
 C=[1,1];
 D=poly(0,'s');
 P=syslin('c',A,B,C,D);
  ]]></programlisting>
-        <para>
-            <literal>bloc2exp(syst)</literal> returns the evaluation the lft of
-            <literal>P</literal> and <literal>K</literal>.
-        </para>
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="bloc2exp">bloc2exp</link>
+                <link linkend="poly">poly</link>
             </member>
         </simplelist>
     </refsection>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/CHAPTER b/scilab/modules/elementary_functions/help/en_US/symbolic/CHAPTER
deleted file mode 100644 (file)
index ac6fa5d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Symbolic
-
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/addf.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/addf.xml
deleted file mode 100644 (file)
index 5137fad..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="addf">
-    <refnamediv>
-        <refname>addf</refname>
-        <refpurpose>symbolic addition</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>c = addf(a, b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>a, b, c</term>
-                <listitem>
-                    <para>character strings.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            The function <function>addf</function> performs a symbolic addition.
-            <code>c = addf("a", "b")</code> returns the character string <varname>c</varname>
-            which is <literal>"a + b"</literal>. Trivial simplifications such as <code>addf("0", "a")</code> or <code>addf("1", "2")</code> are performed.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-addf('0','1')
-addf('1','a')
-addf('1','2')
-addf('a','b')
-'a'+'b'
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/cmb_lin.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/cmb_lin.xml
deleted file mode 100644 (file)
index d48beff..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="cmb_lin">
-    <refnamediv>
-        <refname>cmb_lin</refname>
-        <refpurpose>symbolic linear combination</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[x] = cmb_lin(alfa, x, beta, y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>alfa, beta, x, y</term>
-                <listitem>
-                    <para>character strings.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Evaluates symbolic linear combination <code>alfa*x-beta*y</code>. (low-level routine)
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-cmb_lin('alfa','x','beta','y')
-cmb_lin('alfa','x','beta','-y')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/ldivf.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/ldivf.xml
deleted file mode 100644 (file)
index ef814c1..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="ldivf">
-    <refnamediv>
-        <refname>ldivf</refname>
-        <refpurpose>left symbolic division</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>ldivf(d, c)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>d, c</term>
-                <listitem>
-                    <para>character strings.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <code>ldivf('d', 'c')</code> performs the left symbolic division and returns the
-            string <literal>'c\d'</literal>. Trivial simplifications such as <literal>'1\c' = 'c'</literal> are performed.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-ldivf('1','1')
-ldivf('a','0')
-ldivf('a','x')
-ldivf('2','4')
-ldivf('0','a') //Caution...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/mulf.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/mulf.xml
deleted file mode 100644 (file)
index 4af3bd2..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="mulf">
-    <refnamediv>
-        <refname>mulf</refname>
-        <refpurpose>symbolic multiplication</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>mulf(d, c)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>d, c</term>
-                <listitem>
-                    <para>character strings.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <code>mulf('d', 'c')</code> performs the symbolic multiplication and returns
-            the string <literal>'c*d'</literal>. Trivial simplifications such as <literal>'1*c' = 'c'</literal> are performed.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-mulf('1','a')
-mulf('0','a')
-'a'*'b'   //Caution...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/rdivf.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/rdivf.xml
deleted file mode 100644 (file)
index 9805d16..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="rdivf">
-    <refnamediv>
-        <refname>rdivf</refname>
-        <refpurpose>right symbolic division</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[r] = rdivf(d, c)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>d, c, r </term>
-                <listitem>
-                    <para>character strings.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <code>r=rdivf("d", "c")</code> returns the string <varname>r</varname> which is
-            <literal>"c/d"</literal>. Trivial simplifications such as <literal>"c/1" = "c"</literal> are performed.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-rdivf('c','d')
-rdivf('1','2')
-rdivf('0','a')
-rdivf('a','0') //Caution...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/solve.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/solve.xml
deleted file mode 100644 (file)
index f2e5798..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="solve" xml:lang="en">
-    <refnamediv>
-        <refname>solve</refname>
-        <refpurpose>symbolic linear system solver</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[x] = solve(A, b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>A, b, x</term>
-                <listitem>
-                    <para>matrix (resp. vectors) of character strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <code>x = solve(A, b)</code> solves <literal>A*x = b</literal> when
-            <literal>A</literal> is an upper triangular matrix made of character strings.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','a';'0','2'];   //Upper triangular 
-b=['x';'y'];
-
-w=solve(A,b)
-
-a=1;x=2;y=5;
-evstr(w)
-inv([1,1;0,2])*[2;5]
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/subf.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/subf.xml
deleted file mode 100644 (file)
index 8fa087c..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="subf">
-    <refnamediv>
-        <refname>subf</refname>
-        <refpurpose>symbolic subtraction</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[c] = subf(a, b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>a, b, c</term>
-                <listitem>
-                    <para>character strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <code>c = subf("a", "b")</code> performs a symbolic subtraction and returns the
-            character string <varname>c</varname> which is <literal>"a-b"</literal>. Trivial
-            simplifications such as <literal>subf("0","a")</literal> or
-            <literal>subf("1","2")</literal> are performed.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-subf('0','a')
-subf('2','1')
-subf('a','0')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/trianfml.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/trianfml.xml
deleted file mode 100644 (file)
index 891aaa1..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trianfml" xml:lang="en">
-    <refnamediv>
-        <refname>trianfml</refname>
-        <refpurpose>symbolic triangularization</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[f [,sexp]]=trianfml(f [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Symbolic triangularization of the matrix <literal>f</literal> ;
-            triangularization is performed by elementary row operations;
-            <literal>sexp</literal> is a set of common expressions stored by the
-            algorithm.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','2';'a','b']
-W=trianfml([A,string(eye(2,2))])
-U=W(:,3:4)
-a=5;b=6;
-A=evstr(A)
-U=evstr(U)
-U*A
-evstr(W(:,1:2))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-            <member>
-                <link linkend="trisolve">trisolve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/en_US/symbolic/trisolve.xml b/scilab/modules/elementary_functions/help/en_US/symbolic/trisolve.xml
deleted file mode 100644 (file)
index 6e37ca1..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA Francois DELEBECQUE
- * 
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trisolve" xml:lang="en">
-    <refnamediv>
-        <refname>trisolve</refname>
-        <refpurpose>symbolic linear system solver</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>[x [,sexp]] = trisolve(A,b [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>A,b</term>
-                <listitem>
-                    <para>matrices of strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            symbolically solves <literal>A*x =b</literal> , <literal>A</literal>
-            being assumed to be upper triangular.
-        </para>
-        <para>
-            <literal>sexp</literal> is a vector of common subexpressions in
-            <literal>A, b, x</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-A=['x','y';'0','z'];b=['0';'1'];
-w=trisolve(A,b)
-x=5;y=2;z=4;
-evstr(w)
-inv(evstr(A))*evstr(b)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/CHAPTER b/scilab/modules/elementary_functions/help/fr_FR/symbolic/CHAPTER
deleted file mode 100644 (file)
index fee6dab..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Calcul symbolique
-
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/addf.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/addf.xml
deleted file mode 100644 (file)
index 0a59d30..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="addf">
-    <refnamediv>
-        <refname>addf</refname>
-        <refpurpose>addition symbolique  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>addf("a","b")</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>"a","b"  </term>
-                <listitem>
-                    <para>chaînes de caractères
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>addf("a","b")</literal> renvoie la chaîne de caractères <literal>"a+b"</literal>.
-            Des simplifications triviales du type <literal>addf("0","a")</literal> ou
-            <literal>addf("1","2")</literal> sont effectuées.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-addf('0','1')
-addf('1','a')
-addf('1','2')
-'a'+'b'
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/cmb_lin.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/cmb_lin.xml
deleted file mode 100644 (file)
index bb9ad18..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="cmb_lin">
-    <refnamediv>
-        <refname>cmb_lin</refname>
-        <refpurpose>combinaison linéaire symbolique  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>[x]=cmb_lin(alfa,x,beta,y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Évalue <literal>alfa*x-beta*y</literal>. <literal> alfa, beta, x, y</literal> sont des chaînes de caractères (routine de bas niveau).
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/ldivf.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/ldivf.xml
deleted file mode 100644 (file)
index 6fecc0a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="ldivf">
-    <refnamediv>
-        <refname>ldivf</refname>
-        <refpurpose>division à gauche symbolique  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>ldivf('d','c')</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Renvoie la chaîne de caractères <literal>'c\d'</literal>
-            Des simplifications triviales du type <literal>'1\c' = 'c'</literal> sont effectuées.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-ldivf('1','1')
-ldivf('a','0')
-ldivf('a','x')
-ldivf('2','4')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/mulf.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/mulf.xml
deleted file mode 100644 (file)
index be3188d..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="mulf">
-    <refnamediv>
-        <refname>mulf</refname>
-        <refpurpose>multiplication symbolique  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>mulf('d','c')</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Renvoie la chaîne de caractères <literal>'c*d'</literal>. Des simplifications triviales du type <literal>'1*c' = 'c'</literal> sont effectuées.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-mulf('1','a')
-mulf('0','a')
-'a'+'b'   // attention ...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/rdivf.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/rdivf.xml
deleted file mode 100644 (file)
index cdb0932..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="rdivf">
-    <refnamediv>
-        <refname>rdivf</refname>
-        <refpurpose>division symbolique à droite  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>["r"]=ldivf("d","c")</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>"d","c","r"  </term>
-                <listitem>
-                    <para>strings
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Renvoie la chaîne de caractères <literal>"c/d"</literal>
-            Des simplifications triviales du type <literal>"c/1" = "c"</literal> sont effectuées.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-ldivf('c','d')
-ldivf('1','2')
-ldivf('a','0')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/solve.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/solve.xml
deleted file mode 100644 (file)
index 956f8a7..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="solve" xml:lang="fr">
-    <refnamediv>
-        <refname>solve</refname>
-        <refpurpose>solveur symbolique de système linéaire</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>[x]=solve(A,b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>A,b,x</term>
-                <listitem>
-                    <para>matrices (resp. vecteurs) de chaînes de caractères</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Résout <literal>A*x = b</literal> quand <literal>A</literal> est une
-            matrice triangulaire supérieure de chaînes de caractères.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','a';'0','2'];   //  matrice triangulaire supérieure 
-b=['x';'y'];
-w=solve(A,b)
-a=1;x=2;y=5;
-evstr(w)
-inv([1,1;0,2])*[2;5]
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/subf.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/subf.xml
deleted file mode 100644 (file)
index 6653d45..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="subf">
-    <refnamediv>
-        <refname>subf</refname>
-        <refpurpose>soustraction symbolique  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>["c"]=subf("a","b")</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>"a","b","c"  </term>
-                <listitem>
-                    <para>strings
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Renvoie la chaîne de caractères  <literal>c</literal>=<literal>"a-b"</literal>.
-            Des simplifications triviales du type <literal>subf("0","a")</literal> et
-            <literal>subf("1","2")</literal> sont effectuées.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-subf('0','a')
-subf('2','1')
-subf('a','0')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/trianfml.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/trianfml.xml
deleted file mode 100644 (file)
index 2e75983..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trianfml" xml:lang="fr">
-    <refnamediv>
-        <refname>trianfml</refname>
-        <refpurpose>triangularisation symbolique</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>[f [,sexp]]=trianfml(f [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Triangularisation symbolique de la matrice <literal>f</literal>. La
-            triangularisation est faite par manipulations élémentaires de lignes et de
-            colonnes. <literal>sexp</literal> est un ensemble d'expressions communes
-            stockées par l'algorithme.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','2';'a','b']
-W=trianfml([A,string(eye(2,2))])
-U=W(:,3:4)
-a=5;b=6;
-A=evstr(A)
-U=evstr(U)
-U*A
-evstr(W(:,1:2))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-            <member>
-                <link linkend="trisolve">trisolve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/symbolic/trisolve.xml b/scilab/modules/elementary_functions/help/fr_FR/symbolic/trisolve.xml
deleted file mode 100644 (file)
index e47baa7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trisolve" xml:lang="fr">
-    <refnamediv>
-        <refname>trisolve</refname>
-        <refpurpose>solveur symbolique de système linéaire</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>[x [,sexp]] = trisolve(A,b [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>A,b,x</term>
-                <listitem>
-                    <para>matrices (resp. vecteurs) de chaînes de caractères</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Résout <literal>A*x = b</literal> quand <literal>A</literal> est une
-            matrice triangulaire supérieure de chaînes de caractères.
-        </para>
-        <para>
-            <literal>sexp</literal> est un ensemble d'expressions communes dans
-            <literal>A</literal>, <literal>b</literal> et <literal>x</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-A=['x','y';'0','z'];b=['0';'1'];
-w=trisolve(A,b)
-x=5;y=2;z=4;
-evstr(w)
-inv(evstr(A))*evstr(b)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ja_JP/signalprocessing/bloc2exp.xml b/scilab/modules/elementary_functions/help/ja_JP/signalprocessing/bloc2exp.xml
deleted file mode 100644 (file)
index 0b58907..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- * 
- * 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="bloc2exp" xml:lang="ja">
-    
-    <refnamediv>
-        
-        <refname>bloc2exp</refname>
-        
-        <refpurpose>ブロック図から数式に変換</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[str]=bloc2exp(blocd)
-            
-            [str,names]=bloc2exp(blocd)
-            
-        </synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>パラメータ</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>blocd</term>
-                
-                <listitem>
-                    
-                    <para>リスト</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>str</term>
-                
-                <listitem>
-                    
-                    <para>文字列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>names</term>
-                
-                <listitem>
-                    
-                    <para>文字列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            線形システムのブロック図表現を指定すると,
-            
-            <literal>bloc2exp</literal> はその記号評価を返します.
-            
-            リスト <literal>blocd</literal>の最初の要素は,
-            
-            文字列 <literal>'blocd'</literal>である必要があります.
-            
-            このリストのその他の各要素 <literal>(blocd(2),blocd(3),...)</literal>
-            
-            は,それ自体が以下の型のリストです:
-            
-        </para>
-        
-        <programlisting role=""><![CDATA[ 
-list('transfer','name_of_linear_system')
- ]]></programlisting>
-        
-        <programlisting role=""><![CDATA[  
-list('link','name_of_link',
-               [number_of_upstream_box,upstream_box_port],
-               [downstream_box_1,downstream_box_1_portnumber],
-               [downstream_box_2,downstream_box_2_portnumber],
-               ...)
- ]]></programlisting>
-        
-        <para>
-            
-            文字列 <literal>'transfer'</literal> および
-            
-            <literal>'link'</literal> はブロック図の中での要素の型を示す
-            
-            キーワードです.
-            
-        </para>
-        
-        <para>ケース1 : 
-            
-            リストの2番目のパラメータは,
-            
-            状態空間表現(<literal>syslin</literal> リスト)または伝達関数形式(有理数の行列)
-            
-            で指定される
-            
-            線形システムのScilab名を指す(またはそのように評価される)文字列
-            
-            です.
-            
-        </para>
-        
-        <para>
-            
-            各伝達関数ブロックには1つの整数値がふられます.
-            
-            伝達関数ブロックの各入力および出力にも整数値の番号がふられます.
-            
-            (例を参照)
-            
-        </para>
-        
-        <para>ケース2 : 
-            
-            ブロック図表現の2種類目の要素はリンクです.
-            
-            リンクは,
-            
-            対<literal>[number_of_upstream_box,upstream_box_port]</literal>で
-            
-            表されるブロックの出力と
-            
-            他のブロックの入力を結合します.
-            
-            この際,各入力は,対
-            
-            <literal>[downstream_box_i,downstream_box_i_portnumber]</literal>
-            
-            のように表されます.
-            
-        </para>
-        
-        <para>ブロックの異なる要素を任意の順序で
-            
-            定義できます.
-            
-        </para>
-        
-        <para>例えば,</para>
-        
-        <para>
-            
-            [1] ゲイン1のフィードバックを有する <literal>S1*S2</literal> .
-            
-        </para>
-        
-        <para>
-            
-            3つの伝達関数, <literal>S1</literal> (番号
-            
-            <literal>n_s1=2</literal>) , <literal>S2</literal> (番号
-            
-            <literal>n_s2=3</literal>) および伝達関す記号が<literal>['1','1']</literal>
-            
-            となる加算器  (番号
-            
-            <literal>n_add=4</literal>) があります.
-            
-        </para>
-        
-        <para>
-            
-            リンクは 4 つあります. 最初のリンク (名前は <literal>'U'</literal>)
-            
-            入力 を加算器のポート1に結合します.
-            
-            2番目と3番目のリンクはそれぞれ,
-            
-            加算器の(出力)ポート1をシステム<literal>S1</literal>の(入力)ポート1,
-            
-            <literal>S1</literal>の(出力)ポート1を<literal>S2</literal>の(入力)ポート1
-            
-            に結合します.
-            
-            (<literal>'Y'</literal>という名前の)4番目のリンクは,
-            
-            <literal>S2</literal>の出力ポート1を出力
-            
-            (仮想的なブロック -1 のポート0, 省略されている)
-            
-            および加算器の(入力)ポート2に結合します.
-            
-        </para>
-        
-        <programlisting role="example"><![CDATA[ 
-//Initialization
-syst=list('blocd'); l=1;
-//Systems
-l=l+1;n_s1=l;syst(l)=list('transfer','S1');  //System 1
-l=l+1;n_s2=l;syst(l)=list('transfer','S2');  //System 2
-l=l+1;n_adder=l;syst(l)=list('transfer',['1','1']);  //adder
-//Links
-// Inputs  -1 --> input 1
-l=l+1;syst(l)=list('link','U',[-1],[n_adder,1]);
-// Internal 
-l=l+1;syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
-l=l+1;syst(l)=list('link',' ',[n_s1,1],[n_s2,1]);
-// Outputs // -1 -> output 1
-l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
-//Evaluation call
-w=bloc2exp(syst);
- ]]></programlisting>
-        
-        <para>結果は以下の文字列となります:
-            
-            <literal>w=-(s2*s1-eye())\s2*s1</literal>.
-            
-        </para>
-        
-        <para>
-            
-            出力引数を二つとして使用する場合,
-            
-            <literal>[str,names]=blocd(syst)</literal>は,
-            
-            <literal>names</literal>にリンク名の記号リストを返すことに注意してください.
-            
-            この機能は,入力と出力に名前を付けたい場合に有用です.
-            
-        </para>
-        
-        <programlisting role="example"><![CDATA[ 
-//Initialization
-syst=list('blocd'); l=1;
-//System (2x2 blocks plant)
-l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']);  
-//Controller
-l=l+1;n_k=l;syst(l)=list('transfer','k'); 
-//Links
-l=l+1;syst(l)=list('link','w',[-1],[n_s,1]);
-l=l+1;syst(l)=list('link','z',[n_s,1],[-1]);
-l=l+1;syst(l)=list('link','u',[n_k,1],[n_s,2]);
-l=l+1;syst(l)=list('link','y',[n_s,2],[n_k,1]);
-//Evaluation call
-w=bloc2exp(syst);
- ]]></programlisting>
-        
-        <para>この例では, 結果は一般的な式に等価な式となります:</para>
-        
-        <para>
-            
-            <literal>P11+P12*invr(eye()-K*P22)*K*P21;</literal>
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="bloc2ss">bloc2ss</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
index 1aa6bd0..81cefbc 100644 (file)
@@ -4,11 +4,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA - Serge STEER
  * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- * 
+ *
  * 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
             
         </para>
         
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 list('transfer','name_of_linear_system')
  ]]></programlisting>
         
-        <programlisting role=""><![CDATA[  
+        <programlisting role=""><![CDATA[
 list('link','name_of_link',
              [number_of_upstream_box,upstream_box_port],
              [downstream_box_1,downstream_box_1_portnumber],
@@ -107,7 +107,7 @@ list('link','name_of_link',
             
         </para>
         
-        <para>ケース1 : 
+        <para>ケース1 :
             
             リストの2番目のパラメータは,
             
@@ -131,7 +131,7 @@ list('link','name_of_link',
             
         </para>
         
-        <para>ケース2 : 
+        <para>ケース2 :
             
             ブロック図表現の2種類目の要素はリンクです.
             
@@ -209,7 +209,7 @@ list('link','name_of_link',
         
         <title>例</title>
         
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Initialization
 syst=list('blocd'); l=1;
 //Systems
@@ -219,7 +219,7 @@ l=l+1;n_adder=l;syst(l)=list('transfer',['1','1']);  //adder
 //Links
 // Inputs  -1 --> input 1
 l=l+1;syst(l)=list('link','U1',[-1],[n_adder,1]);
-// Internal 
+// Internal
 l=l+1;syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
 l=l+1;syst(l)=list('link',' ',[n_s1,1],[n_s2,1]);
 // Outputs // -1 -> output 1
@@ -238,11 +238,11 @@ l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
         
         <para>[2] LFT の例</para>
         
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Initialization
 syst=list('blocd'); l=1;
 //System (2x2 blocks plant)
-l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']); 
+l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']);
 //Controller
 l=l+1;n_k=l;syst(l)=list('transfer','k');
 //Links
@@ -254,39 +254,21 @@ l=l+1;syst(l)=list('link','y',[n_s,2],[n_k,1]);
         
         <para>ただし,</para>
         
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 A=[0,1;0,0];
 B=[1;1];
 C=[1,1];
 D=poly(0,'s');
 P=syslin('c',A,B,C,D);
  ]]></programlisting>
-        
-        <para>
-            
-            <literal>bloc2exp(syst)</literal> は,
-            
-            <literal>P</literal> および <literal>K</literal>のLFT表現を返します.
-            
-        </para>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
-                <link linkend="bloc2exp">bloc2exp</link>
-                
+                <link linkend="poly">poly</link>
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
 </refentry>
 
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/addf.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/addf.xml
deleted file mode 100644 (file)
index 002628e..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="addf">
-    
-    <refnamediv>
-        
-        <refname>addf</refname>
-        
-        <refpurpose>シンボリックな加算</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>c = addf(a, b)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>a, b, c</term>
-                
-                <listitem>
-                    
-                    <para>文字列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            関数<function>addf</function>は,シンボリックな加算を行います.
-            
-            <code>c = addf("a", "b")</code> は,文字列  <varname>c</varname>
-            
-            に<literal>"a + b"</literal>を返します.
-            
-            <code>addf("0", "a")</code> または <code>addf("1", "2")</code>
-            
-            のような簡単化が行われます.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-addf('0','1')
-addf('1','a')
-addf('1','2')
-addf('a','b')
-'a'+'b'
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="mulf">mulf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="subf">subf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="ldivf">ldivf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="rdivf">rdivf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="eval">eval</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="evstr">evstr</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/cmb_lin.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/cmb_lin.xml
deleted file mode 100644 (file)
index b48d4fe..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="cmb_lin">
-    
-    <refnamediv>
-        
-        <refname>cmb_lin</refname>
-        
-        <refpurpose>シンボリックな線形結合</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[x] = cmb_lin(alfa, x, beta, y)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>alfa, beta, x, y</term>
-                
-                <listitem>
-                    
-                    <para>文字列.</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <code>alfa*x-beta*y</code>を評価します. 
-            
-            (低レベルルーチン)
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[
-cmb_lin('alfa','x','beta','y')
-cmb_lin('alfa','x','beta','-y')
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="mulf">mulf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="addf">addf</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/ldivf.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/ldivf.xml
deleted file mode 100644 (file)
index af15535..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="ldivf">
-    
-    <refnamediv>
-        
-        <refname>ldivf</refname>
-        
-        <refpurpose>シンボリックな左除算</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>ldivf(d, c)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>d, c</term>
-                
-                <listitem>
-                    
-                    <para>文字列.</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <code>ldivf('d', 'c')</code>は,
-            
-            シンボリックな左除算を行い,
-            
-            文字列 <literal>'c\d'</literal>を返します.
-            
-            <literal>'1\c' = 'c'</literal>のような簡単化が行われます.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-ldivf('1','1')
-ldivf('a','0')
-ldivf('a','x')
-ldivf('2','4')
-ldivf('0','a') //注意...
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="rdivf">rdivf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="addf">addf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="mulf">mulf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="evstr">evstr</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/mulf.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/mulf.xml
deleted file mode 100644 (file)
index fadffac..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="mulf">
-    
-    <refnamediv>
-        
-        <refname>mulf</refname>
-        
-        <refpurpose>シンボリックな乗算</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>mulf(d, c)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>d, c</term>
-                
-                <listitem>
-                    
-                    <para>文字列.</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <code>mulf('d', 'c')</code>は,シンボリックな乗算を行い,
-            
-            文字列 <literal>'c*d'</literal>を返します.
-            
-            <literal>'1*c' = 'c'</literal>のような簡単化が行われます.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-mulf('1','a')
-mulf('0','a')
-'a'*'b'   //注意...
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="rdivf">rdivf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="addf">addf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="subf">subf</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/rdivf.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/rdivf.xml
deleted file mode 100644 (file)
index 6eb58d4..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="rdivf">
-    
-    <refnamediv>
-        
-        <refname>rdivf</refname>
-        
-        <refpurpose>シンボリックな右除算</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[r]=rdivf(d, c)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>d, c, r  </term>
-                
-                <listitem>
-                    
-                    <para>文字列.</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <code>r=rdivf("d", "c")</code> は,文字列<varname>r</varname>に
-            
-            文字列 <literal>"c/d"</literal>を返します.
-            
-            <literal>"c/1" = "c"</literal> のような簡単化が行われます.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-rdivf('c','d')
-rdivf('1','2')
-rdivf('0','a')
-rdivf('a','0') //注意...
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="ldivf">ldivf</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/solve.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/solve.xml
deleted file mode 100644 (file)
index 662a843..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="solve" xml:lang="ja">
-    
-    <refnamediv>
-        
-        <refname>solve</refname>
-        
-        <refpurpose>代数線形システムのソルバ</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[x] = solve(A, b)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>A,b,x</term>
-                
-                <listitem>
-                    
-                    <para>文字列の行列 (またはベクトル) </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <code>x = solve(A, b)</code>は,
-            
-            <literal>A</literal> が文字列からなる上三角行列の時に,
-            
-            <literal>A*x = b</literal>を解きます.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-A=['1','a';'0','2'];   //上三角行列
-b=['x';'y'];
-w=solve(A,b)
-a=1;x=2;y=5;
-evstr(w)
-inv([1,1;0,2])*[2;5]
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="trianfml">trianfml</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/subf.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/subf.xml
deleted file mode 100644 (file)
index f2f80cf..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="subf">
-    
-    <refnamediv>
-        
-        <refname>subf</refname>
-        
-        <refpurpose>シンボリックな減算</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[c] = subf(a, b)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>a, b, c</term>
-                
-                <listitem>
-                    
-                    <para>文字列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <code>c = subf("a", "b")</code> はシンボリックな減算を行い,
-            
-            文字列<varname>c</varname>に<literal>"a-b"</literal>を返します.
-            
-            <literal>subf("0","a")</literal> または
-            
-            <literal>subf("1","2")</literal> のような簡単化が行われます.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-subf('0','a')
-subf('2','1')
-subf('a','0')
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="addf">addf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="mulf">mulf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="ldivf">ldivf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="rdivf">rdivf</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="eval">eval</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="evstr">evstr</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/trianfml.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/trianfml.xml
deleted file mode 100644 (file)
index dd4e2cf..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trianfml" xml:lang="ja">
-    <refnamediv>
-        <refname>trianfml</refname>
-        <refpurpose>シンボリックな三角化</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>[f [,sexp]]=trianfml(f [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>説明</title>
-        <para>
-            行列 <literal>f</literal>のシンボリックな三角化 ;
-            行要素操作におり三角化が行われます;
-            <literal>sexp</literal> はアルゴリズムにより保存された
-            共通の式の集合です.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','2';'a','b']
-W=trianfml([A,string(eye(2,2))])
-U=W(:,3:4)
-a=5;b=6;
-A=evstr(A)
-U=evstr(U)
-U*A
-evstr(W(:,1:2))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-            <member>
-                <link linkend="trisolve">trisolve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ja_JP/symbolic/trisolve.xml b/scilab/modules/elementary_functions/help/ja_JP/symbolic/trisolve.xml
deleted file mode 100644 (file)
index e89ae4c..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA Francois DELEBECQUE
- * 
- * 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.1-en.txt
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trisolve" xml:lang="ja">
-    
-    <refnamediv>
-        
-        <refname>trisolve</refname>
-        
-        <refpurpose>シンボリックな線形システムソルバ</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>[x [,sexp]] = trisolve(A,b [,sexp])</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>A,b</term>
-                
-                <listitem>
-                    
-                    <para>文字列の行列</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <literal>A*x =b</literal>をシンボリックに解きます.
-            
-            <literal>A</literal>は上三角行列と仮定されます.
-            
-        </para>
-        
-        <para>
-            
-            <literal>sexp</literal> は,
-            
-            <literal>A, b, x</literal>の共通の副次式のベクトルです.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-A=['x','y';'0','z'];b=['0';'1'];
-w=trisolve(A,b)
-x=5;y=2;z=4;
-evstr(w)
-inv(evstr(A))*evstr(b)
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="trianfml">trianfml</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="solve">solve</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/elementary_functions/help/pt_BR/signalprocessing/bloc2exp.xml b/scilab/modules/elementary_functions/help/pt_BR/signalprocessing/bloc2exp.xml
deleted file mode 100644 (file)
index f974190..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- * 
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="bloc2exp" xml:lang="en">
-    <refnamediv>
-        <refname>bloc2exp</refname>
-        <refpurpose>retorna a avaliação simbólica de um diagrama de
-            blocos
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[str]=bloc2exp(blocd)
-            [str,names]=bloc2exp(blocd)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>blocd</term>
-                <listitem>
-                    <para>lista</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>str</term>
-                <listitem>
-                    <para>string </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>names</term>
-                <listitem>
-                    <para>string</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>Dada uma representação em diagrama de blocos de um sistema linear
-            <literal>bloc2exp</literal> retorna sua avaliação simbólica. O primeiro
-            elemento da lista <literal>blocd</literal> deve ser o string (cadeia de
-            caracteres) <literal>'blocd'</literal>. Cada outro elemento desta lista
-            <literal>(blocd(2),blocd(3),...)</literal> é, por si mesmo, uma lista de
-            um dos seguintes tipos :
-        </para>
-        <programlisting><![CDATA[ 
-list('transfer','nome_do_sistema_linear')
- ]]></programlisting>
-        <programlisting><![CDATA[ 
-list('link','nome_da_ligação',
-               [número_de_caixa_de_fluxo_superior,porta_da_caixa_de_fluxo_superior],
-               [caixa_de_fluxo_inferior_1,número_de_porta_da_caixa_inferior_1],
-               [caixa_de_fluxo_inferior_2,número_de_porta_da_caixa_inferior_2],
-               ...)
- ]]></programlisting>
-        <para>
-            Os strings <literal>'transfer'</literal> e
-            <literal>'link'</literal> são palavras-chaves as quais indicam o tipo de
-            elemento no diagrama de blocos ("transfer"=transferência, "link"=
-            ligação).
-        </para>
-        <para>Caso 1: o segundo parâmetro da lista é um string que pode se referir
-            (para uma possível avaliação posterior) ao nome Scilab de um sistema
-            linear dado em representação de estado-espaço (lista<literal>
-                syslin
-            </literal>
-            )ou em forma de trasnferência (matriz de razões de
-            polinômios).
-        </para>
-        <para>A cada bloco de transferência é associado um inteiro. A cada entrada
-            e saída de um bloco de transferência, também é associado seu número, um
-            inteiro (ver exemplos).
-        </para>
-        <para>Caso 2: O segundo tipo de elemento em uma representação de diagrama
-            de blocos é um link. Um link liga uma saída de um bloco representado pelo
-            par <literal>[
-                número_de_caixa_de_fluxo_superior,porta_da_caixa_de_fluxo_superior]
-            </literal>
-            ,
-            a diferentes entradas de outros blocos. Cada tal entrada é representada
-            pelo par [caixa_de_fluxo_inferior_i,número_de_porta_da_caixa_inferior_i]
-            .
-        </para>
-        <para>Os diferentes elementos de um diagrama de blocos podem ser definidos
-            em ordem arbitrária.
-        </para>
-        <para>Por exemplo:</para>
-        <para>
-            [1] <literal>S1*S2</literal> com feedback (resposta) de
-            unidade.
-        </para>
-        <para>
-            Há 3 transferências <literal>S1</literal> (número
-            <literal>n_s1=2</literal>) , <literal>S2</literal> (número
-            <literal>n_s2=3</literal>) e um adicionador ("adder") (número
-            <literal>n_add=4</literal>) com função de transferência simbólica
-            <literal>['1','1']</literal>.
-        </para>
-        <para>
-            Há 4 ligações. O primeiro (de nome <literal>'U'</literal>) liga a
-            entrada (porta 0 de bloco fictício -1, omitido) à porta 1 do adicionador.
-            Os segundo e terceiro ligam respectivamente a porta (de saída) 1 do
-            adicionador à porta (de entrada) 1 do sistema <literal>S1</literal>, e a
-            porta (de saída) 1 de <literal>S1</literal> à porta (de entrada) 1 de
-            <literal>S2</literal>. A quarta ligação (de nome <literal>'Y'</literal>)
-            liga a porta (de saída) 1 de <literal>S2</literal> à saída (porta 0 do
-            bloco fictício -1, omitido) e à porta (de entrada) 2 do
-            adicionador.
-        </para>
-        <programlisting role="example"><![CDATA[ 
-//Inicialização
-syst=list('blocd'); l=1;
-//
-//Sistemas
-l=l+1;n_s1=l;syst(l)=list('transfer','S1');  //Sistema 1
-l=l+1;n_s2=l;syst(l)=list('transfer','S2');  //Sistema 2
-l=l+1;n_adder=l;syst(l)=list('transfer',['1','1']);  //adicionador
-//
-//Links
-// Entradas  -1 --> entrada 1
-l=l+1;syst(l)=list('link','U',[-1],[n_adder,1]);
-// Internal 
-l=l+1;syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
-l=l+1;syst(l)=list('link',' ',[n_s1,1],[n_s2,1]);
-// Saídas // -1 -> saída 1
-l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
-//Chamada de avaliação
-w=bloc2exp(syst);
- ]]></programlisting>
-        <para>O resultado é o string:
-            <literal>w=-(s2*s1-eye())\s2*s1</literal>.
-        </para>
-        <para>Perceba que, chamado com dois agumentos de saída,
-            <literal>[str,names]= blocd(syst)</literal> retorna em
-            <literal>names</literal> a lista de nomes simbólicos dos links nomeados.
-            Isto é útil para definir nomes de entradas e saídas.
-        </para>
-        <para>[2] segundo exemplo</para>
-        <programlisting role="example"><![CDATA[ 
-//Inicialização
-syst=list('blocd'); l=1;
-
-//Sistema (planta de blocos 2x2)
-l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']);  
-
-//Controlador
-l=l+1;n_k=l;syst(l)=list('transfer','k'); 
-
-//Links
-l=l+1;syst(l)=list('link','w',[-1],[n_s,1]);
-l=l+1;syst(l)=list('link','z',[n_s,1],[-1]);
-l=l+1;syst(l)=list('link','u',[n_k,1],[n_s,2]);
-l=l+1;syst(l)=list('link','y',[n_s,2],[n_k,1]);
-
-//Chamada de avaliação
-w=bloc2exp(syst);
- ]]></programlisting>
-        <para>Neste caso, o resultado é uma fórmula equivalente à usual:</para>
-        <para>
-            <literal>P11+P12*invr(eye()-K*P22)*K*P21;</literal>
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="bloc2ss">bloc2ss</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>Autores</title>
-        <para>S. S., F. D. (INRIA)</para>
-    </refsection>
-</refentry>
index c4d3895..d86104e 100644 (file)
@@ -3,11 +3,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA - Serge STEER
  * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- * 
+ *
  * 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
             <literal>'blocd'</literal>. Cada outro elemento desta lista é, por si
             mesmo, uma lista de um dos seguintes tipos :
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 list('transfer','nome_do_sistema_linear')
  ]]></programlisting>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 list('link','nome_do_link', [número_de_caixa_de_fluxo_superior,porta_da_caixa_de_fluxo_superior],
                [caixa_de_fluxo_inferior_1,número_de_porta_da_caixa_inferior_1],
                [caixa_de_fluxo_inferior_2,número_de_porta_da_caixa_inferior_2],
@@ -107,7 +107,7 @@ list('link','nome_do_link', [n
             a porta (de saída) 1 de <literal>S2</literal> à saída (porta 0 do bloco
             fictício -1, omitido) e à porta (de entrada) 2 do adicionador.
         </para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Inicialização
 syst=list('blocd'); l=1;
 
@@ -120,7 +120,7 @@ l=l+1;n_adder=l;syst(l)=list('transfer',['1','1']);  //adicionador
 // Entradas  -1 --> entrada 1
 l=l+1;syst(l)=list('link','U1',[-1],[n_adder,1]);
 
-// Internal 
+// Internal
 l=l+1;syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
 l=l+1;syst(l)=list('link',' ',[n_s1,1],[n_s2,1]);
 
@@ -135,12 +135,12 @@ l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
         <para>[2] exemplo da transformação linear fracional (TLF e, em inglês
             LFT):
         </para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Inicialização
 syst=list('blocd'); l=1;
 
 //Sistema (planta de blocos 2x2)
-l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']); 
+l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']);
 
 //Controlador
 l=l+1;n_k=l;syst(l)=list('transfer','k');
@@ -152,23 +152,19 @@ l=l+1;syst(l)=list('link','u',[n_k,1],[n_s,2]);
 l=l+1;syst(l)=list('link','y',[n_s,2],[n_k,1]);
  ]]></programlisting>
         <para>Com</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 A=[0,1;0,0];
 B=[1;1];
 C=[1,1];
 D=poly(0,'s');
 P=syslin('c',A,B,C,D);
  ]]></programlisting>
-        <para>
-            <literal>bloc2exp(syst)</literal> retorna a avaliação de TLF de
-            <literal>P</literal> e <literal>K</literal>.
-        </para>
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="bloc2exp">bloc2exp</link>
+                <link linkend="poly">poly</link>
             </member>
         </simplelist>
     </refsection>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/CHAPTER b/scilab/modules/elementary_functions/help/pt_BR/symbolic/CHAPTER
deleted file mode 100644 (file)
index ac6fa5d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Symbolic
-
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/addf.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/addf.xml
deleted file mode 100644 (file)
index 850c552..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="addf" xml:lang="en">
-    <refnamediv>
-        <refname>addf</refname>
-        <refpurpose>adição simbólica</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>addf("a","b")</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>"a","b"</term>
-                <listitem>
-                    <para>strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            <literal>addf("a","b")</literal> retorna a cadeia de caracteres
-            <literal>"a+b"</literal>. Simplificações triviais tais como
-            <literal>addf("0","a")</literal> ou <literal>addf("1","2")</literal> são
-            realizadas.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-addf('0','1')
-addf('1','a')
-addf('1','2')
-'a'+'b'
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/cmb_lin.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/cmb_lin.xml
deleted file mode 100644 (file)
index a1f6232..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="cmb_lin" xml:lang="en">
-    <refnamediv>
-        <refname>cmb_lin</refname>
-        <refpurpose>combinação linear simbólica</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[x]=cmb_lin(alfa,x,beta,y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Avalia <literal>alfa*x-beta*y</literal>. <literal> alfa, beta, x,
-                y
-            </literal>
-            são strings. (rotina de baixo-nível).
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/ldivf.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/ldivf.xml
deleted file mode 100644 (file)
index 07a30db..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ldivf" xml:lang="en">
-    <refnamediv>
-        <refname>ldivf</refname>
-        <refpurpose>divisão simbólica esquerda (invertida)</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>ldivf('d','c')</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Retorna o string <literal>'c\d'</literal> Simplificações triviais
-            como <literal>'1\c' = 'c'</literal> são realizadas.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-ldivf('1','1')
-ldivf('a','0')
-ldivf('a','x')
-ldivf('2','4')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/mulf.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/mulf.xml
deleted file mode 100644 (file)
index 31bb637..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="mulf" xml:lang="en">
-    <refnamediv>
-        <refname>mulf</refname>
-        <refpurpose>multiplicação simbólica</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>mulf('d','c')</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Retorna o string <literal>'c*d'</literal> Simplificações triviais
-            tais como <literal>'1*c' = 'c'</literal> são realizadas.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-mulf('1','a')
-mulf('0','a')
-'a'+'b'   //Cuidado...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/rdivf.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/rdivf.xml
deleted file mode 100644 (file)
index e01abb8..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="rdivf" xml:lang="en">
-    <refnamediv>
-        <refname>rdivf</refname>
-        <refpurpose>divisão simbólica direita-esquerda</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>["r"]=ldivf("d","c")</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>"d","c","r"</term>
-                <listitem>
-                    <para>strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Retorna o string <literal>"c/d"</literal> Simplificações triviais
-            tais como <literal>"c/1" = "c"</literal> são realizadas.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-ldivf('c','d')
-ldivf('1','2')
-ldivf('a','0')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/solve.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/solve.xml
deleted file mode 100644 (file)
index 9e3ceef..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="solve" xml:lang="en">
-    <refnamediv>
-        <refname>solve</refname>
-        <refpurpose>Solucionador simbólico de sistemas lineares</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[x]=solve(A,b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>A,b,x</term>
-                <listitem>
-                    <para>matrizes (respectivamente vetores) de "strings"</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Resolve <literal>A*x = b</literal> quando <literal>A</literal> é uma
-            matriz triangular superior feita de strings.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','a';'0','2'];   //Triangular superior 
-b=['x';'y'];
-w=solve(A,b)
-a=1;x=2;y=5;
-evstr(w)
-inv([1,1;0,2])*[2;5]
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/subf.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/subf.xml
deleted file mode 100644 (file)
index b5e9832..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="subf" xml:lang="en">
-    <refnamediv>
-        <refname>subf</refname>
-        <refpurpose>subtração simbólica</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>["c"]=subf("a","b")</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>"a","b","c"</term>
-                <listitem>
-                    <para>strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Retorna o string <literal>c</literal>=<literal>"a-b"</literal>.
-            Simplificações triviais como <literal>subf("0","a")</literal> ou
-            <literal>subf("1","2")</literal> são realizadas.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-subf('0','a')
-subf('2','1')
-subf('a','0')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/trianfml.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/trianfml.xml
deleted file mode 100644 (file)
index 36db0d6..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trianfml" xml:lang="en">
-    <refnamediv>
-        <refname>trianfml</refname>
-        <refpurpose>triangularização simbólica</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[f [,sexp]]=trianfml(f [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Triangularização simbólica da matriz <literal>f</literal> ; a
-            triangularização é executada por transformações elementares de linha;
-            <literal>sexp</literal> é um conjunto de expressões comuns aramazenadas
-            pelo algoritmo.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','2';'a','b']
-W=trianfml([A,string(eye(2,2))])
-U=W(:,3:4)
-a=5;b=6;
-A=evstr(A)
-U=evstr(U)
-U*A
-evstr(W(:,1:2))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-            <member>
-                <link linkend="trisolve">trisolve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/pt_BR/symbolic/trisolve.xml b/scilab/modules/elementary_functions/help/pt_BR/symbolic/trisolve.xml
deleted file mode 100644 (file)
index a620592..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA Francois DELEBECQUE
- * 
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trisolve" xml:lang="en">
-    <refnamediv>
-        <refname>trisolve</refname>
-        <refpurpose>solucionador simbólico de sistemas lineares</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[x [,sexp]] = trisolve(A,b [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>A,b</term>
-                <listitem>
-                    <para>matrizes de strings</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Resolve simbolicamente <literal>A*x =b</literal> ,
-            <literal>A</literal> sendo assumida como triangular superior.
-        </para>
-        <para>
-            <literal>sexp</literal> é um vetor de subexpressões comuns em
-            <literal>A, b, x</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-A=['x','y';'0','z'];b=['0';'1'];
-w=trisolve(A,b)
-x=5;y=2;z=4;
-evstr(w)
-inv(evstr(A))*evstr(b)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>Autores</title>
-        <para>F.D, S.S</para>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/signalprocessing/bloc2exp.xml b/scilab/modules/elementary_functions/help/ru_RU/signalprocessing/bloc2exp.xml
deleted file mode 100644 (file)
index 5358b80..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- * 
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="bloc2exp" xml:lang="ru">
-    <refnamediv>
-        <refname>bloc2exp</refname>
-        <refpurpose>преобразование блок-схемы в символьное выражение</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[str]=bloc2exp(blocd)
-            [str,names]=bloc2exp(blocd)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>blocd</term>
-                <listitem>
-                    <para>список</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>str</term>
-                <listitem>
-                    <para>строка</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>names</term>
-                <listitem>
-                    <para>строка</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Для указанной блок-схемы элемента линейной системы списка     <literal>bloc2exp</literal> возвращает её символьное вычисление. Первый элемент 
-            списка <literal>blocd</literal> должен быть строкой <literal>'blocd'</literal>.
-            Остальные элементы этого списка 
-            <literal>(blocd(2),blocd(3),...)</literal> сами по себе являются списком одного из следующих типов:
-        </para>
-        <programlisting><![CDATA[ 
-list('transfer','name_of_linear_system')
- ]]></programlisting>
-        <programlisting><![CDATA[  
-list('link','name_of_link',
-               [number_of_upstream_box,upstream_box_port],
-               [downstream_box_1,downstream_box_1_portnumber],
-               [downstream_box_2,downstream_box_2_portnumber],
-               ...)
- ]]></programlisting>
-        <para>
-            Строки <literal>'transfer'</literal> и <literal>'link'</literal> являются
-            ключевыми словами, которые указывают тип элемента в блок-схеме.
-        </para>
-        <para>
-            Случай 1: второй параметр списка является символьной строкой, которая может 
-            ссылаться (для возможного последующего выполнения) на Scilab-имя линейной системы, 
-            заданной в представлении пространства состояний (<literal>syslin</literal> список) 
-            или передаточную форму (матрица рациональных дробей).
-        </para>
-        <para>
-            Каждому передаточному блоку присвоено целое число. Каждому входу и выходу передаточного блока также присвоено целое число (см. примеры).
-        </para>
-        <para>
-            Случай 2: второй вид элемента в представлении блок-схемы - это связь (link).
-            Связь связывает один выход блока, представленного парой 
-            <literal>[number_of_upstream_box,upstream_box_port]</literal> (т.е. 
-            <literal>[номер_предшествующего_блока,порт_предшествующего_блока]</literal>) с
-            различными другими блоками. Каждый такой вход представлен парой 
-            <literal>[downstream_box_i,downstream_box_i_portnumber]</literal> 
-            (т.е. <literal>[последующий_блок_i,номер_порта_последующего_блока_i]</literal>).
-        </para>
-        <para>
-            Различные элементы блок-схемы могут быть определены в произвольном порядке.
-        </para>
-        <para>Например</para>
-        <para>
-            [1] <literal>S1*S2</literal> с обратной связью блока.
-        </para>
-        <para>
-            Есть 3 передаточных звена <literal>S1</literal> (число <literal>n_s1=2</literal>),
-            <literal>S2</literal> (число <literal>n_s2=3</literal>) и сумматор 
-            (число <literal>n_add=4</literal>) с символьной передаточной функцией 
-            <literal>['1','1']</literal>.
-        </para>
-        <para>
-            Есть 4 связи. Первая (названная <literal>'U'</literal>) связывает вход (порт 0 условного блока -1 не рассматривается) с портом 1 сумматора. Вторая и третья связи 
-            соответственно (выходной) порт 1 сумматора с (входным) портом 1 системы 
-            <literal>S1</literal>, а (выходной) порт 1  <literal>S1</literal> с (входным) портом 
-            1 <literal>S2</literal>. Четвёртая связь (названная <literal>'Y'</literal>) 
-            связывает (выходной) порт 1 <literal>S2</literal> с выходом (порт 0 условного блока 
-            -1 не рассматривается) и с (входным) портом 2 сумматора.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-//Инициализация
-syst=list('blocd'); l=1;
-//Системы
-l=l+1;n_s1=l;syst(l)=list('transfer','S1');  //Система 1
-l=l+1;n_s2=l;syst(l)=list('transfer','S2');  //Система 2
-l=l+1;n_adder=l;syst(l)=list('transfer',['1','1']);  //сумматор
-//Связи
-// входы  -1 --> вход 1
-l=l+1;syst(l)=list('link','U',[-1],[n_adder,1]);
-
-// Внутренние 
-l=l+1;syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
-l=l+1;syst(l)=list('link',' ',[n_s1,1],[n_s2,1]);
-// Выходы // -1 -> выход 1
-l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
-//Вызов выполнения
-w=bloc2exp(syst);
- ]]></programlisting>
-        <para>
-            Результатом является символьная строка: <literal>w=-(s2*s1-eye())\s2*s1</literal>.
-        </para>
-        <para>
-            Заметим, что вызов с двумя выходными аргументами <literal>[str,names]=blocd(syst)</literal>
-            возвращает в <literal>names</literal> список символьных имён наименованных связей. 
-            Это полезно для установки имён входам и выходам.
-        </para>
-        <para>[2] второй пример</para>
-        <programlisting role="example"><![CDATA[ 
-//Инициализация
-syst=list('blocd'); l=1;
-//Система (установка блоков 2x2)
-l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']);  
-//Контроллер
-l=l+1;n_k=l;syst(l)=list('transfer','k'); 
-//Связи
-l=l+1;syst(l)=list('link','w',[-1],[n_s,1]);
-l=l+1;syst(l)=list('link','z',[n_s,1],[-1]);
-l=l+1;syst(l)=list('link','u',[n_k,1],[n_s,2]);
-l=l+1;syst(l)=list('link','y',[n_s,2],[n_k,1]);
-//Вызов вычисления
-w=bloc2exp(syst);
- ]]></programlisting>
-        <para>
-            В этом случае результатом является формула, эквивалентная обычной формуле:
-        </para>
-        <para>
-            <literal>P11+P12*invr(eye()-K*P22)*K*P21;</literal>
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="bloc2ss">bloc2ss</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index ec4d525..3a167ac 100644 (file)
@@ -3,11 +3,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA - Serge STEER
  * Copyright (C) 2008 - INRIA - Francois DELEBECQUE
- * 
+ *
  * 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
         <para>
             Заданную линейную систему в виде блок-схемы <literal>bloc2ss</literal> преобразует в линейную систему пространство состояний. Первый элемент списка  <literal>blocd</literal> должен быть строкой <literal>'blocd'</literal>. Остальные элементы этого списка должны сами по себе быть списками одного из следующего типа:
         </para>
-        <programlisting><![CDATA[ 
+        <programlisting><![CDATA[
 list('transfer','name_of_linear_system')
  ]]></programlisting>
-        <programlisting><![CDATA[  
+        <programlisting><![CDATA[
 list('link','name_of_link',
              [number_of_upstream_box,upstream_box_port],
              [downstream_box_1,downstream_box_1_portnumber],
@@ -83,33 +83,33 @@ list('link','name_of_link',
         </para>
         <para>
             Есть 4 связи. Первая (с именем <literal>'U'</literal>) связывает вход (порт 0
-            условного блока -1 не рассматривается) с портом 1 сумматора. Вторая и третья связи 
-            соответственно (выходной) порт 1 сумматора с (входным) портом 1 системы 
-            <literal>S1</literal>, а (выходной) порт 1  <literal>S1</literal> с (входным) портом 
-            1 <literal>S2</literal>. Четвёртая связь (названная <literal>'Y'</literal>) 
-            связывает (выходной) порт 1 <literal>S2</literal> с выходом (порт 0 условного блока 
+            условного блока -1 не рассматривается) с портом 1 сумматора. Вторая и третья связи
+            соответственно (выходной) порт 1 сумматора с (входным) портом 1 системы
+            <literal>S1</literal>, а (выходной) порт 1  <literal>S1</literal> с (входным) портом
+            1 <literal>S2</literal>. Четвёртая связь (названная <literal>'Y'</literal>)
+            связывает (выходной) порт 1 <literal>S2</literal> с выходом (порт 0 условного блока
             -1 не рассматривается) и с (входным) портом 2 сумматора.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Инициализация
 syst=list('blocd'); l=1;
+
 //Системы
 l=l+1;n_s1=l;syst(l)=list('transfer','S1');  //Система 1
 l=l+1;n_s2=l;syst(l)=list('transfer','S2');  //Система 2
 l=l+1;n_adder=l;syst(l)=list('transfer',['1','1']);  //сумматор
+
 //Связи
 // Выходы  -1 --> выход 1
 l=l+1;syst(l)=list('link','U1',[-1],[n_adder,1]);
-// Внутренние 
+
+// Внутренние
 l=l+1;syst(l)=list('link',' ',[n_adder,1],[n_s1,1]);
 l=l+1;syst(l)=list('link',' ',[n_s1,1],[n_s2,1]);
+
 // Выходы // -1 -> output 1
 l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
  ]]></programlisting>
@@ -117,16 +117,16 @@ l=l+1;syst(l)=list('link','Y',[n_s2,1],[-1],[n_adder,2]);
             Для <literal>s=poly(0,'s');S1=1/(s+1);S2=1/s;</literal> результатом вызова исполнения <literal>sl=bloc2ss(syst);</literal> является представление в пространстве состояний для <literal>1/(s^2+s-1)</literal>.
         </para>
         <para>[2] Пример LFT</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // Инициализация
 syst=list('blocd'); l=1;
+
 // Система (установка блоков 2x2)
-l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']); 
+l=l+1;n_s=l;syst(l)=list('transfer',['P11','P12';'P21','P22']);
+
 // Контроллер
 l=l+1;n_k=l;syst(l)=list('transfer','k');
+
 // Связи
 l=l+1;syst(l)=list('link','w',[-1],[n_s,1]);
 l=l+1;syst(l)=list('link','z',[n_s,1],[-1]);
@@ -134,22 +134,19 @@ l=l+1;syst(l)=list('link','u',[n_k,1],[n_s,2]);
 l=l+1;syst(l)=list('link','y',[n_s,2],[n_k,1]);
  ]]></programlisting>
         <para>С</para>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 A=[0,1;0,0];
 B=[1;1];
 C=[1,1];
 D=poly(0,'s');
 P=syslin('c',A,B,C,D);
  ]]></programlisting>
-        <para>
-            <literal>bloc2exp(syst)</literal> возвращает lft <literal>P</literal> и <literal>K</literal>.
-        </para>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="bloc2exp">bloc2exp</link>
+                <link linkend="poly">poly</link>
             </member>
         </simplelist>
     </refsection>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/CHAPTER b/scilab/modules/elementary_functions/help/ru_RU/symbolic/CHAPTER
deleted file mode 100644 (file)
index a5cd4aa..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Символьное вычисление
-
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/addf.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/addf.xml
deleted file mode 100644 (file)
index ce38dbf..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="addf">
-    <refnamediv>
-        <refname>addf</refname>
-        <refpurpose>символьное суммирование</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>c = addf(a, b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>a, b, c</term>
-                <listitem>
-                    <para>символьные строки.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Функция <function>addf</function> выполняет символьное суммирование.
-            <code>c = addf("a", "b")</code> возвращает символьную строку <varname>c</varname>,
-            которая равна <literal>"a + b"</literal>. Выполняются простейшие упрощения, такие как <code>addf("0", "a")</code> или <code>addf("1", "2")</code>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-addf('0','1')
-addf('1','a')
-addf('1','2')
-addf('a','b')
-'a'+'b'
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/cmb_lin.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/cmb_lin.xml
deleted file mode 100644 (file)
index 23a3d1d..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="cmb_lin">
-    <refnamediv>
-        <refname>cmb_lin</refname>
-        <refpurpose>символьное линейное сочетание</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[x] = cmb_lin(alfa, x, beta, y)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>alfa, beta, x, y</term>
-                <listitem>
-                    <para>символьные строки.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Выполняет символьное линейное сочетание <code>alfa*x-beta*y</code>. (Низкоуровневая программа).
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[
-cmb_lin('alfa','x','beta','y')
-cmb_lin('alfa','x','beta','-y')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/ldivf.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/ldivf.xml
deleted file mode 100644 (file)
index 3e2f583..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="ldivf">
-    <refnamediv>
-        <refname>ldivf</refname>
-        <refpurpose>левое символьное деление</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>ldivf(d, c)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>d, c</term>
-                <listitem>
-                    <para>символьные строки.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            <code>ldivf('d', 'c')</code> выполняет левое символьное деление (деление справа
-            налево) и возвращает строку <literal>'c\d'</literal>. Выполняются такие
-            простейшие упрощения как <literal>'1\c' = 'c'</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-ldivf('1','1')
-ldivf('a','0')
-ldivf('a','x')
-ldivf('2','4')
-ldivf('0','a') // Осторожно, ошибка...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/mulf.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/mulf.xml
deleted file mode 100644 (file)
index 37ceccb..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="mulf">
-    <refnamediv>
-        <refname>mulf</refname>
-        <refpurpose>символьное умножение</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>mulf(d, c)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>d, c</term>
-                <listitem>
-                    <para>символьные строки.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            <code>mulf('d', 'c')</code> выполняет символьное умножение и возвращает
-            строковое значение <literal>'c*d'</literal>. Выполняются такие простейшие
-            упрощения как <literal>'1*c' = 'c'</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-mulf('1','a')
-mulf('0','a')
-'a'*'b'   // Осторожно, ошибка...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="subf">subf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/rdivf.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/rdivf.xml
deleted file mode 100644 (file)
index 8f7e2ad..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="rdivf">
-    <refnamediv>
-        <refname>rdivf</refname>
-        <refpurpose>правое символьное деление</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[r] = rdivf(d, c)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>d, c, r </term>
-                <listitem>
-                    <para>символьные строки.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            <code>r=rdivf("d", "c")</code> выполняет правое символьное деление (деление слева
-            направо) и возвращает строку <varname>r</varname>, которая равна
-            <literal>"c/d"</literal>. Выполняются такие простейшие упрощения как
-            <literal>"c/1" = "c"</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-rdivf('c','d')
-rdivf('1','2')
-rdivf('0','a')
-rdivf('a','0') // Осторожно, ошибка...
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/solve.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/solve.xml
deleted file mode 100644 (file)
index a85e948..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="solve" xml:lang="ru">
-    <refnamediv>
-        <refname>solve</refname>
-        <refpurpose>решатель линейной системы в символьном виде</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[x] = solve(A, b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>A, b, x</term>
-                <listitem>
-                    <para>матрица (соответственно, векторы) символьных строк.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Инструкция <code>x = solve(A, b)</code> решает уравнение <literal>A*x = b</literal>, где <literal>A</literal> является верхней треугольной матрицей,
-            составленной из символьных строк.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','a';'0','2'];   //верхняя треугольная матрица
-b=['x';'y'];
-w=solve(A,b)
-a=1;x=2;y=5;
-evstr(w)
-inv([1,1;0,2])*[2;5]
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/subf.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/subf.xml
deleted file mode 100644 (file)
index 8d7f5cd..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="subf">
-    <refnamediv>
-        <refname>subf</refname>
-        <refpurpose>символьное вычитание</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[c] = subf(a, b)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>a, b, c</term>
-                <listitem>
-                    <para>символьные строки.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            <code>c = subf("a", "b")</code> выполняет символьное вычитание и возвращает символьную строку <varname>c</varname>, которая равна <literal>"a-b"</literal>. Выполняются такие простейшие упрощения как <literal>subf("0","a")</literal> или
-            <literal>subf("1","2")</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-subf('0','a')
-subf('2','1')
-subf('a','0')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="ldivf">ldivf</link>
-            </member>
-            <member>
-                <link linkend="rdivf">rdivf</link>
-            </member>
-            <member>
-                <link linkend="eval">eval</link>
-            </member>
-            <member>
-                <link linkend="evstr">evstr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/trianfml.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/trianfml.xml
deleted file mode 100644 (file)
index 94ea787..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trianfml" xml:lang="ru">
-    <refnamediv>
-        <refname>trianfml</refname>
-        <refpurpose>триангуляция в символьном виде</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[f [,sexp]]=trianfml(f [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Триангуляция матрицы  <literal>f</literal> в символьном виде; 
-            триангуляция выполняется элементарными операциями над строками матрицы;
-            <literal>sexp</literal> является набором общих выражений, сохранённых алгоритмом.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-A=['1','2';'a','b']
-W=trianfml([A,string(eye(2,2))])
-U=W(:,3:4)
-a=5;b=6;
-A=evstr(A)
-U=evstr(U)
-U*A
-evstr(W(:,1:2))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="addf">addf</link>
-            </member>
-            <member>
-                <link linkend="mulf">mulf</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-            <member>
-                <link linkend="trisolve">trisolve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ru_RU/symbolic/trisolve.xml b/scilab/modules/elementary_functions/help/ru_RU/symbolic/trisolve.xml
deleted file mode 100644 (file)
index c2c8ace..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Serge STEER
- * Copyright (C) 2008 - INRIA Francois DELEBECQUE
- * 
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="trisolve" xml:lang="ru">
-    <refnamediv>
-        <refname>trisolve</refname>
-        <refpurpose>решатель линейной системы в символьном виде</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>[x [,sexp]] = trisolve(A,b [,sexp])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>A,b</term>
-                <listitem>
-                    <para>матрицы строк</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Решает уравнение <literal>A*x =b</literal> в символьном виде, <literal>A</literal> предполагается верхней треугольной матрицей.
-        </para>
-        <para>
-            <literal>sexp</literal> - вектор общих подвыражений в <literal>A, b, x</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-A=['x','y';'0','z'];b=['0';'1'];
-w=trisolve(A,b)
-x=5;y=2;z=4;
-evstr(w)
-inv(evstr(A))*evstr(b)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="trianfml">trianfml</link>
-            </member>
-            <member>
-                <link linkend="solve">solve</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 2dcc081..84f7401 100644 (file)
@@ -1367,7 +1367,6 @@ unpack
 vec2list
 aff2ab
 classmarkov
-cmb_lin
 coff
 colcomp
 companion
@@ -1544,7 +1543,6 @@ augment
 balreal
 bilin
 black
-bloc2exp
 bloc2ss
 bode
 bode_asymp
@@ -1695,8 +1693,6 @@ tf2des
 tf2ss
 time_id
 trfmod
-trianfml
-trisolve
 trzeros
 ui_observer
 unobs
index c7819cd..baaa358 100644 (file)
@@ -642,7 +642,6 @@ jwrapinfloat
 kron
 lasterror
 ldiv
-ldivf
 legendre
 length
 lib
@@ -713,7 +712,6 @@ mtell
 mtlb_mode
 mtlb_sparse
 mucomp
-mulf
 nearfloat
 newaxes
 newest
@@ -767,7 +765,6 @@ rand
 rankqr
 rat
 rcond
-rdivf
 read
 read4b
 read_csv
@@ -864,7 +861,6 @@ strstr
 strsubst
 strtod
 strtok
-subf
 sum
 svd
 swap_handles
diff --git a/scilab/modules/linear_algebra/macros/cmb_lin.sci b/scilab/modules/linear_algebra/macros/cmb_lin.sci
deleted file mode 100644 (file)
index 8125899..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ????-2008 - 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.1-en.txt
-
-function [x]=cmb_lin(alfa,x,Beta,y)
-    //  x =cmb_lin(alfa,x,Beta,y) evaluates alfa*x-Beta*y
-    // (low-level routine)
-    //!
-    n=prod(size(x));
-    for j=1:n,
-        x(j)=addf(mulf(alfa,x(j)),mulf(mulf("-1",Beta),y(j)));
-    end
-endfunction
index abb4687..ebfb3ba 100644 (file)
@@ -39,7 +39,7 @@ function vect=addf_mat(M,N)
     [n,m]=size(M);
     for i=1:n
         for j=1:m
-            vect(i,j)=addf(M(i,j),N(i,j));
+            vect(i,j)=M(i,j) + "+" + N(i,j);
         end
     end
 endfunction
index 58ff48c..e53b721 100644 (file)
@@ -25,6 +25,6 @@ function x=addfv(x1,x2)
     elseif (x2 == []) then
         x=x1;
     else
-        x=addf(x1,x2);
+        x=x1 + "+" + x2;
     end
 endfunction
index 4e0dd5d..08f2a2b 100644 (file)
@@ -60,7 +60,7 @@ function [eq_pts_mes]=eval_pts_EF(a,b,nelem,kind,nint,nodes,x,xi,w,N,mesures)
         uh="";
         for l=1:n
             l1=nodes(l,nel);
-            uh=addf(uh,mulf(msprintfv(psi(l)),u(l1)));
+            uh=addfv(uh,"("+msprintfv(psi(l))+")*("+u(l1)+")");
         end
         eq_pts_mes(npt) = uh;
     end
index 869aea9..5ef5731 100644 (file)
@@ -79,7 +79,7 @@ function [equations,impl_type,Nfictif]=gen_code_FDM(a1,b1,a2,b2,a3,b3,a4,b4,..
         end
 
         for i=1:Nfictif
-            equations(i)="   res["+string(i-1)+"]="+subf(vec2(i+Nfictif),dvec2(i))+";";
+            equations(i)="   res["+string(i-1)+"]="+vec2(i+Nfictif)+"-"+dvec2(i)+";";
             F=mulfv(msprintfv(a7_ev(i)),b7);
             if (i == 1) then
                 // prise en compte des conditions aux limites en a
index f560de6..c5de89f 100644 (file)
@@ -79,7 +79,7 @@ function [equations,impl_type]=gen_code_FEM(A,B1,B2,C1,C2,C3,F3,oper,N,..
         end
 
         for i=1:N
-            equations(i)="   res["+string(i-1)+"]="+subf(vec2(i+N),dvec2(i))+";";
+            equations(i)="   res["+string(i-1)+"]="+vec2(i+N)+"-"+dvec2(i)+";";
             F=mulfv(msprintfv(F3(i)),b7);
             if (i == 1) then
                 // prise en compte des conditions aux limites de type Dirichlet par dualisation en a
index 803ee19..07f83b1 100644 (file)
@@ -129,7 +129,7 @@ function [equations,flag_type,impl_type]=gen_code_FVM(a1,b1,a2,b2,a3,b3,a4,b4,..
                 elseif (i == N) then
                     F=subfv(F,mulfv(clb,b5));
                 end
-                C=addf(mulfv(multMatVect(coef51(i,:),vec2(1:N)),b5),mulf3v(msprintfv(h*a6_ev(i)),b6,vec2(i)));
+                C=addfv(mulfv(multMatVect(coef51(i,:),vec2(1:N)),b5),mulf3v(msprintfv(h*a6_ev(i)),b6,vec2(i)));
                 equations(i)="   res["+string(i-1)+"]="+subfv(F,C)+";";
             end
         end
index 6d921c4..1754884 100644 (file)
@@ -21,6 +21,6 @@
 
 function x=mulf3(x1,x2,x3)
     // mulf avec 3 entr�e : x=mulf(x1,x2,x3)
-    xx=mulf(x1,x2);
-    x=mulf(xx,x3);
+    xx="("+x1+")*("+x2+")";
+    x="("+xx+")*("+x3+")";
 endfunction
index 319a394..bbfd77c 100644 (file)
@@ -33,11 +33,11 @@ function vect=mulf_string(M,vec)
     for i=1:N
         line=[];
         for j=1:N
-            line=[line,mulf(M(i,j),vec(j))];
+            line=[line,"("+M(i,j) + ")*(" +vec(j)+")"];
         end
         som="";
         for i=1:N
-            som=addf(som,line(i));
+            som=som + "+" + line(i);
         end
         vect=[vect;som];
     end
index f95c693..a04247b 100644 (file)
@@ -23,6 +23,6 @@ function x=mulfv(x1,x2)
     if (x1 == [] | x2 == [] | x1 == "" | x2 == "") then
         x="0";
     else
-        x=mulf(x1,x2);
+        x="(" + x1 + ")*(" + x2 + ")";
     end
 endfunction
index 4facf30..802e3ec 100644 (file)
@@ -39,7 +39,7 @@ function vect=subf_mat(M,N)
     [n,m]=size(M);
     for i=1:n
         for j=1:m
-            vect(i,j)=subf(M(i,j),N(i,j));
+            vect(i,j)=M(i,j)+"-"+N(i,j);
         end
     end
 endfunction
index 80f4a44..e2135d1 100644 (file)
@@ -25,6 +25,6 @@ function x=subfv(x1,x2)
     elseif (x2 == []) then
         x=x1;
     else
-        x=subf(x1,x2);
+        x=x1+"-"+x2;
     end
 endfunction