* Bug 15360 fixed: actual denom() and numer() removal 03/19803/5
Samuel GOUGEON [Mon, 26 Feb 2018 13:29:11 +0000 (14:29 +0100)]
  http://bugzilla.scilab.org/15360

  Code already cleaned up at https://codereview.scilab.org/19650

Change-Id: I8c28acecc8464bf847f27cebb8e3ecbd7cdabb58

13 files changed:
scilab/CHANGES.md
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/polynomials/help/en_US/denom.xml [deleted file]
scilab/modules/polynomials/help/en_US/numer.xml [deleted file]
scilab/modules/polynomials/help/fr_FR/denom.xml [deleted file]
scilab/modules/polynomials/help/fr_FR/numer.xml [deleted file]
scilab/modules/polynomials/help/ja_JP/denom.xml [deleted file]
scilab/modules/polynomials/help/ja_JP/numer.xml [deleted file]
scilab/modules/polynomials/help/pt_BR/denom.xml [deleted file]
scilab/modules/polynomials/help/pt_BR/numer.xml [deleted file]
scilab/modules/polynomials/locales/polynomials.pot
scilab/modules/polynomials/macros/denom.sci [deleted file]
scilab/modules/polynomials/macros/numer.sci [deleted file]

index 39fe420..5a502bb 100644 (file)
@@ -184,6 +184,8 @@ Removed Functions
 * `eval` was obsolete and has been removed. Please use `evstr` instead.
 * `hypermat` was obsolete and has been removed. Please use `matrix` instead.
 * `lstsize` was obsolete and has been removed. Please use `size` instead.
+* `denom` was obsolete and has been removed. Please use the `.den` rational field instead.
+* `numer` was obsolete and has been removed. Please use the `.num` rational field instead.
 * `square` was obsolete and has been removed.
 * `strcmpi` was obsolete and has been removed. Please use `strcmp(,'i')` instead.
 * `xgetech` was obsolete and has been removed. Please use `gca` instead.
@@ -249,6 +251,7 @@ Bug Fixes
 * [#15309](http://bugzilla.scilab.org/show_bug.cgi?id=15309): `eval()` was a weak duplicate of `evstr()`. It should be removed.
 * [#15321](http://bugzilla.scilab.org/show_bug.cgi?id=15321): `lu()` was leaking memory.
 * [#15350](http://bugzilla.scilab.org/show_bug.cgi?id=15350): `ric_desc()` should be merged into `riccati()`.
+* [#15360](http://bugzilla.scilab.org/show_bug.cgi?id=15360): `numer()` and `denom()` were poor and duplicates of the `.num` and `.den` fields of rationals. They are removed.
 * [#15368](http://bugzilla.scilab.org/show_bug.cgi?id=15368): `freson()` silently returned frequencies not corresponding to a maximum, or returned [] instead of some still computable maxima frequencies.
 * [#15392](http://bugzilla.scilab.org/show_bug.cgi?id=15392): `comet` and `comet3d` did not allow specifying colors with colors names.
 * [#15393](http://bugzilla.scilab.org/show_bug.cgi?id=15393): In a new figure, `nicholschart` plotted nothing. The default frame color was a flashy cyan. The position of gain labels could be puzzling. It was not possible to specify colors by their names. Postprocessing the frames and the set of labels was not easy.
index 2f4c5ae..497c8a4 100644 (file)
@@ -551,7 +551,6 @@ chepol
 cmndred
 coffg
 colcompr
-denom
 derivat
 determ
 detr
@@ -566,7 +565,6 @@ inv_coeff
 invr
 lcm
 lcmdiag
-numer
 pdiv
 pfactors
 pol2des
diff --git a/scilab/modules/polynomials/help/en_US/denom.xml b/scilab/modules/polynomials/help/en_US/denom.xml
deleted file mode 100644 (file)
index aa274d6..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="denom">
-    <refnamediv>
-        <refname>denom</refname>
-        <refpurpose>denominator <emphasis role="bold">(obsolete)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>den=denom(r)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>r</term>
-                <listitem>
-                    <para>rational or polynomial or constant matrix.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>den</term>
-                <listitem>
-                    <para>polynomial matrix</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <warning>
-            This function is obsolete and will be removed from Scilab 6.1.0. Please use the
-            <literal>.den</literal> rational attribute instead.
-        </warning>
-        <para>
-            <literal>den=denom(r)</literal> returns the denominator of a rational matrix.
-        </para>
-        <para>
-            Since rationals are internally represented as
-            <literal>r=list(['r','num','den','dt'],num,den,[])</literal>,
-            <literal>denom(r</literal>) is the same as <literal>r(3)</literal>,
-            <literal>r('den')</literal> or <literal>r.den</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-h=(1+2*%s)/poly(1:4,'s','c');
-denom(h)
-numer(h)
-
-s=poly(0,"s");
-p=1+s+2*s^2;
-denom(p) // Should return 1
-numer(p)
- ]]></programlisting>
-    </refsection>
-
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="numer">numer</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>denom()</literal> is declared obsolete. The rational attribute
-                    <literal>.den</literal> must be used instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/polynomials/help/en_US/numer.xml b/scilab/modules/polynomials/help/en_US/numer.xml
deleted file mode 100644 (file)
index 90245ee..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="numer">
-    <refnamediv>
-        <refname>numer</refname>
-        <refpurpose>numerator <emphasis role="bold">(obsolete)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>num=numer(R)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>R</term>
-                <listitem>
-                    <para>rational or polynomial or constant matrix.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>num</term>
-                <listitem>
-                    <para>polynomial matrix</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <warning>
-            This function is obsolete and will be removed from Scilab 6.1.0. Please use the
-            <literal>.num</literal> rational attribute instead.
-        </warning>
-        <para>
-            Utility function. <literal>num=numer(R)</literal> returns the numerator <literal>num</literal> of a rational
-            function matrix <literal>R</literal> (<literal>R</literal> may be also a constant or polynomial matrix).
-            <literal>numer(R)</literal> is equivalent to <literal>R(2)</literal>, <literal>R('num')</literal> or <literal>R.num</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-h=(1+2*%s)/poly(1:4,'s','c');
-denom(h)
-numer(h)
-
-s=poly(0,"s");
-p=1+s+2*s^2;
-denom(p) // Should return 1
-numer(p)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="denom">denom</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>numer()</literal> is declared obsolete. The rational attribute
-                    <literal>.num</literal> must be used instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/polynomials/help/fr_FR/denom.xml b/scilab/modules/polynomials/help/fr_FR/denom.xml
deleted file mode 100644 (file)
index 0badaa1..0000000
+++ /dev/null
@@ -1,83 +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="denom">
-    <refnamediv>
-        <refname>denom</refname>
-        <refpurpose>dénominateur <emphasis role="bold">(obsolète)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>den=denom(r)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>r  </term>
-                <listitem>
-                    <para>matrice de fractions rationnelles
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>den  </term>
-                <listitem>
-                    <para>matrice de polynômes
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <warning>
-            Cette fonction est obsolète et sera supprimée de Scilab 6.1.0. SVP utiliser
-            l'attribut <literal>.den</literal> des fractions rationnelles à la place.
-        </warning>
-        <para>
-            <literal>den=denom(r)</literal> renvoie le dénominateur d'une
-            matrice rationnelle <literal>R</literal> (<literal>R</literal> peut aussi être
-            une matrice constante ou une matrice de polynômes).
-        </para>
-        <para>
-            Puisque dans Scilab les matrices rationnelles sont représentées
-            comme
-            <literal>r=list(['r','num','den','dt'],num,den,[])</literal>,
-            <literal>denom(r</literal>) est équivalent à <literal>r(3)</literal>,
-            <literal>r('den')</literal> ou <literal>r.den)</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[
-h=(1+2*%s)/poly(1:4,'s','c');
-denom(h)
-numer(h)
-
-s=poly(0,"s");
-p=1+s+2*s^2;
-denom(p) // Devrait retourner 1
-numer(p)
- ]]></programlisting>
-    </refsection>
-
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="numer">numer</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>Historique</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>denom()</literal> est déclarée obsolète. L'attribut
-                    <literal>.den</literal> des fractions rationelles doit être utilisé à la place.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/polynomials/help/fr_FR/numer.xml b/scilab/modules/polynomials/help/fr_FR/numer.xml
deleted file mode 100644 (file)
index 7251590..0000000
+++ /dev/null
@@ -1,74 +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="numer">
-    <refnamediv>
-        <refname>numer</refname>
-        <refpurpose>numérateurs d'une matrice rationnelle <emphasis role="bold">(obsolète)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>num=numer(R)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>R  </term>
-                <listitem>
-                    <para>matrice de fractions rationnelles
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>num  </term>
-                <listitem>
-                    <para>matrice de polynômes
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <warning>
-            Cette fonction est obsolète et sera supprimée de Scilab 6.1.0. SVP utiliser
-            l'attribut <literal>.num</literal> des fractions rationnelles à la place.
-        </warning>
-        <para>
-            <literal>num=numer(R)</literal> renvoie le numérateur <literal>num</literal> d'une matrice rationnelle <literal>R</literal> (<literal>R</literal> peut aussi être une matrice constante ou une matrice de polynômes).
-            <literal>numer(R)</literal> est équivalent à <literal>R(2)</literal>, <literal>R('num')</literal> ou <literal>R.num</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[
-h=(1+2*%s)/poly(1:4,'s','c');
-denom(h)
-numer(h)
-
-s=poly(0,"s");
-p=1+s+2*s^2;
-denom(p) // Devrait retourner 1
-numer(p)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="denom">denom</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>Historique</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>numer()</literal> est déclarée obsolète. L'attribut
-                    <literal>.num</literal> des fractions rationelles doit être utilisé à la place.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/polynomials/help/ja_JP/denom.xml b/scilab/modules/polynomials/help/ja_JP/denom.xml
deleted file mode 100644 (file)
index cda1497..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="denom">
-    <refnamediv>
-        <refname>denom</refname>
-        <refpurpose>分母 <emphasis role="bold">(非推奨関数)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>den=denom(r)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>r</term>
-                <listitem>
-                    <para>有理または多項式または定数行列.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>den</term>
-                <listitem>
-                    <para>多項式行列</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <warning>
-            This function is obsolete and will be removed from Scilab 6.1.0. Please use the
-            <literal>.den</literal> rational attribute instead.
-        </warning>
-        <para>
-            <literal>den=denom(r)</literal>は
-            有理行列の分母を返します.
-        </para>
-        <para>
-            有理数は,内部的に
-            <literal>r=list(['r','num','den','dt'],num,den,[])</literal>と
-            表され,
-            <literal>denom(r</literal>) は <literal>r(3)</literal>,
-            <literal>r('den')</literal> または <literal>r.den</literal>と
-            同じになります.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="numer">numer</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>履歴</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>denom()</literal> is declared obsolete. The rational attribute
-                    <literal>.den</literal> must be used instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/polynomials/help/ja_JP/numer.xml b/scilab/modules/polynomials/help/ja_JP/numer.xml
deleted file mode 100644 (file)
index 4d4980f..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="numer">
-    <refnamediv>
-        <refname>numer</refname>
-        <refpurpose>分子 <emphasis role="bold">(非推奨関数)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>num=numer(R)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>R</term>
-                <listitem>
-                    <para>有理または多項式または定数行列.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>num</term>
-                <listitem>
-                    <para>多項式行列</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <warning>
-            This function is obsolete and will be removed from Scilab 6.1.0. Please use the
-            <literal>.num</literal> rational attribute instead.
-        </warning>
-        <para>
-            ユーティリティ関数. <literal>num=numer(R)</literal> は,
-            有理関数行列<literal>R</literal>の
-            分子<literal>num</literal>を返します
-            (<literal>R</literal> は定数または多項式行列とすることができます).
-            <literal>numer(R)</literal> は <literal>R(2)</literal>, <literal>R('num')</literal> または <literal>R.num</literal>に等しくなります
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="denom">denom</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>履歴</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>numer()</literal> is declared obsolete. The rational attribute
-                    <literal>.num</literal> must be used instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/polynomials/help/pt_BR/denom.xml b/scilab/modules/polynomials/help/pt_BR/denom.xml
deleted file mode 100644 (file)
index bf7f5b5..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="denom" xml:lang="pt">
-    <refnamediv>
-        <refname>denom</refname>
-        <refpurpose>denominador <emphasis role="bold">(obsoleto)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title> Seqüência de Chamamento </title>
-        <synopsis>den=denom(r)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>r</term>
-                <listitem>
-                    <para>matriz de polinômios, de razões de polinômios ou de
-                        constantes.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>den</term>
-                <listitem>
-                    <para>matriz de polinômios</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <warning>
-            Esta função é obsoleta e será removida do Scilab 6.1.0. Use, em vez disso, o atributo
-            racional <literal>.den</literal>.
-        </warning>
-        <para>
-            <literal>den=denom(r)</literal> retorna o denominador de uma matriz
-            de razões de polinômios.
-        </para>
-        <para>Desde que razões de polinômios são representadas internamente como
-            <literal>r=list(['r','num','den','dt'],num,den,[])</literal>,
-            <literal>denom(r</literal>) é o mesmo que <literal>r(3)</literal>,
-            <literal>r('den')</literal> ou <literal>r.den</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title> Ver Também </title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="numer">numer</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>Histórico</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>denom()</literal> is declared obsolete. The rational attribute
-                    <literal>.den</literal> must be used instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/polynomials/help/pt_BR/numer.xml b/scilab/modules/polynomials/help/pt_BR/numer.xml
deleted file mode 100644 (file)
index 91852b8..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<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="numer" xml:lang="pt">
-    <refnamediv>
-        <refname>numer</refname>
-        <refpurpose>numerador <emphasis role="bold">(obsoleto)</emphasis></refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title> Seqüência de Chamamento </title>
-        <synopsis>num=numer(R)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>R</term>
-                <listitem>
-                    <para>matriz de polinômios, de razões de polinômios ou de constantes
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>num</term>
-                <listitem>
-                    <para>matriz de polinômios</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <warning>
-            Esta função é obsoleta e será removida do Scilab 6.1.0. Use, em vez disso, o atributo
-            racional <literal>.num </literal>.
-        </warning>
-        <para>
-            Função utilitária. <literal>num=numer(R)</literal> retorna o
-            numerador <literal>num</literal> de uma matriz de funções racionais
-            <literal>R</literal> (<literal>R</literal> também pode ser uma matriz de
-            polinômios ou de constantes). <literal>numer(R)</literal> é equivalente a
-            <literal>R(2)</literal>, <literal>R('num')</literal> ou
-            <literal>R.num</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title> Ver Também </title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="denom">denom</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>Histórico</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revdescription>
-                    <literal>numer()</literal> is declared obsolete. The rational attribute
-                    <literal>.num</literal> must be used instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index f2e2c17..198111d 100644 (file)
@@ -257,12 +257,10 @@ msgstr ""
 
 #
 # File: modules/polynomials/macros/coffg.sci, line: 25
-# File: modules/polynomials/macros/denom.sci, line: 31
 # File: modules/polynomials/macros/derivat.sci, line: 62
 # File: modules/polynomials/macros/determ.sci, line: 25
 # File: modules/polynomials/macros/detr.sci, line: 38
 # File: modules/polynomials/macros/invr.sci, line: 140
-# File: modules/polynomials/macros/numer.sci, line: 27
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: A floating point number or polynomial "
diff --git a/scilab/modules/polynomials/macros/denom.sci b/scilab/modules/polynomials/macros/denom.sci
deleted file mode 100644 (file)
index 110ea1c..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ????-2008 - INRIA
-// ...
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-
-function den = denom(r)
-    //returns the denominator of a rational matrix
-    //%Syntax: den=denom(r)
-    //with
-    //r: rational function matrix (may be polynomial or scalar matrix)
-    //den: polynomial matrix
-    //!
-    warnobsolete("the r.den rational attribute","6.1.0")
-    select typeof(r)
-    case "constant" then
-        den=ones(r);
-    case "polynomial" then
-        den=ones(r);
-    case "rational" then
-        den=r.den
-    else
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: A floating point number or polynomial or rational fraction array expected.\n"),"denom",1))
-    end
-endfunction
diff --git a/scilab/modules/polynomials/macros/numer.sci b/scilab/modules/polynomials/macros/numer.sci
deleted file mode 100644 (file)
index 7b37110..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ????-2008 - INRIA
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-
-function num=numer(r)
-    //returns the numerator num of a rational function matrix r (r may be
-    //also a scalar or polynomial matrix
-    //!
-    warnobsolete("the r.num rational attribute","6.1.0")
-    select typeof(r)
-    case "constant" then
-        num=r;
-    case "polynomial" then
-        num=r;
-    case "rational" then
-        num=r.num
-    else
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: A floating point number or polynomial or rational fraction array expected.\n"),"numer",1))
-    end
-
-endfunction