systmat() moved from polynomials to CACSD 72/18272/5
Samuel GOUGEON [Tue, 21 Jun 2016 00:21:10 +0000 (02:21 +0200)]
See http://mailinglists.scilab.org/systmat-in-module-polynomial-Loading-rules-tt4034156.html

Change-Id: I80d0eaec60c85ee98481ffa40fa362d6d978d797

16 files changed:
scilab/modules/cacsd/help/en_US/linear_system_representation/sm2des.xml
scilab/modules/cacsd/help/en_US/linear_system_representation/sm2ss.xml
scilab/modules/cacsd/help/en_US/linear_system_representation/systmat.xml [moved from scilab/modules/polynomials/help/en_US/systmat.xml with 100% similarity]
scilab/modules/cacsd/help/fr_FR/linear_system_representation/sm2des.xml [deleted file]
scilab/modules/cacsd/help/fr_FR/linear_system_representation/sm2ss.xml [deleted file]
scilab/modules/cacsd/help/ja_JP/linear_system_representation/sm2des.xml
scilab/modules/cacsd/help/ja_JP/linear_system_representation/sm2ss.xml
scilab/modules/cacsd/help/ja_JP/linear_system_representation/systmat.xml [moved from scilab/modules/polynomials/help/ja_JP/systmat.xml with 100% similarity]
scilab/modules/cacsd/help/pt_BR/linear_system_representation/sm2des.xml [deleted file]
scilab/modules/cacsd/help/pt_BR/linear_system_representation/sm2ss.xml [deleted file]
scilab/modules/cacsd/help/pt_BR/linear_system_representation/systmat.xml [moved from scilab/modules/polynomials/help/pt_BR/systmat.xml with 100% similarity]
scilab/modules/cacsd/help/ru_RU/linear_system_representation/sm2des.xml [deleted file]
scilab/modules/cacsd/help/ru_RU/linear_system_representation/sm2ss.xml [deleted file]
scilab/modules/cacsd/locales/cacsd.pot
scilab/modules/cacsd/macros/systmat.sci [moved from scilab/modules/polynomials/macros/systmat.sci with 100% similarity]
scilab/modules/polynomials/locales/polynomials.pot

index d6af333..863200b 100644 (file)
@@ -46,7 +46,7 @@
         <para>
             Utility function: converts the system matrix:
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 Sm = [-sE + A   B;
      [    C     D]
  ]]></programlisting>
@@ -58,11 +58,14 @@ Sm = [-sE + A   B;
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="ss2des">ss2des</link>
+                <link linkend="systmat">systmat</link>
             </member>
             <member>
                 <link linkend="sm2ss">sm2ss</link>
             </member>
+            <member>
+                <link linkend="ss2des">ss2des</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 98a31ec..6a3daf2 100644 (file)
@@ -46,7 +46,7 @@
         <para>
             Utility function: converts the system matrix:
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
 Sm = [-sI + A   B;
      [    C     D]
  ]]></programlisting>
@@ -58,6 +58,9 @@ Sm = [-sI + A   B;
         <title>See Also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="systmat">systmat</link>
+            </member>
+            <member>
                 <link linkend="ss2des">ss2des</link>
             </member>
         </simplelist>
diff --git a/scilab/modules/cacsd/help/fr_FR/linear_system_representation/sm2des.xml b/scilab/modules/cacsd/help/fr_FR/linear_system_representation/sm2des.xml
deleted file mode 100644 (file)
index d6af333..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 - 
- * 
- * 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="sm2des">
-    <refnamediv>
-        <refname>sm2des</refname>
-        <refpurpose>system matrix to descriptor</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[Des]=sm2des(Sm);</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>Sm</term>
-                <listitem>
-                    <para>polynomial matrix (pencil system matrix)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>Des</term>
-                <listitem>
-                    <para>
-                        descriptor system (<literal>list('des',A,B,C,D,E)</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Utility function: converts the system matrix:
-        </para>
-        <programlisting role=""><![CDATA[ 
-Sm = [-sE + A   B;
-     [    C     D]
- ]]></programlisting>
-        <para>
-            to descriptor system <literal>Des=list('des',A,B,C,D,E)</literal>).
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ss2des">ss2des</link>
-            </member>
-            <member>
-                <link linkend="sm2ss">sm2ss</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/cacsd/help/fr_FR/linear_system_representation/sm2ss.xml b/scilab/modules/cacsd/help/fr_FR/linear_system_representation/sm2ss.xml
deleted file mode 100644 (file)
index 98a31ec..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 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="sm2ss">
-    <refnamediv>
-        <refname>sm2ss</refname>
-        <refpurpose>system matrix to state-space</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[Sl]=sm2ss(Sm);</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>Sm</term>
-                <listitem>
-                    <para>polynomial matrix (pencil system matrix)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>Sl</term>
-                <listitem>
-                    <para>
-                        linear system (<literal>syslin</literal> list)
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Utility function: converts the system matrix:
-        </para>
-        <programlisting role=""><![CDATA[ 
-Sm = [-sI + A   B;
-     [    C     D]
- ]]></programlisting>
-        <para>
-            to linear system in state-space representation (<literal>syslin</literal>) list.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ss2des">ss2des</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index b0300bd..3cdeae1 100644 (file)
@@ -58,11 +58,14 @@ Sm = [-sE + A   B;
         <title>参照</title>
         <simplelist type="inline">
             <member>
-                <link linkend="ss2des">ss2des</link>
+                <link linkend="systmat">systmat</link>
             </member>
             <member>
                 <link linkend="sm2ss">sm2ss</link>
             </member>
+            <member>
+                <link linkend="ss2des">ss2des</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 2392730..0df03fe 100644 (file)
@@ -58,6 +58,12 @@ Sm = [-sI + A   B;
         <title>参照</title>
         <simplelist type="inline">
             <member>
+                <link linkend="systmat">systmat</link>
+            </member>
+            <member>
+                <link linkend="sm2des">sm2des</link>
+            </member>
+            <member>
                 <link linkend="ss2des">ss2des</link>
             </member>
         </simplelist>
diff --git a/scilab/modules/cacsd/help/pt_BR/linear_system_representation/sm2des.xml b/scilab/modules/cacsd/help/pt_BR/linear_system_representation/sm2des.xml
deleted file mode 100644 (file)
index 3985e0b..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 - 
- * 
- * 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="pt" xml:id="sm2des">
-    <refnamediv>
-        <refname>sm2des</refname>
-        <refpurpose>system matrix to descriptor</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[Des]=sm2des(Sm);</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>Sm</term>
-                <listitem>
-                    <para>polynomial matrix (pencil system matrix)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>Des</term>
-                <listitem>
-                    <para>
-                        descriptor system (<literal>list('des',A,B,C,D,E)</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Utility function: converts the system matrix:
-        </para>
-        <programlisting role=""><![CDATA[ 
-Sm = [-sE + A   B;
-     [    C     D]
- ]]></programlisting>
-        <para>
-            to descriptor system <literal>Des=list('des',A,B,C,D,E)</literal>).
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ss2des">ss2des</link>
-            </member>
-            <member>
-                <link linkend="sm2ss">sm2ss</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/cacsd/help/pt_BR/linear_system_representation/sm2ss.xml b/scilab/modules/cacsd/help/pt_BR/linear_system_representation/sm2ss.xml
deleted file mode 100644 (file)
index e927ddb..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 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="pt" xml:id="sm2ss">
-    <refnamediv>
-        <refname>sm2ss</refname>
-        <refpurpose>system matrix to state-space</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[Sl]=sm2ss(Sm);</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>Sm</term>
-                <listitem>
-                    <para>polynomial matrix (pencil system matrix)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>Sl</term>
-                <listitem>
-                    <para>
-                        linear system (<literal>syslin</literal> list)
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Utility function: converts the system matrix:
-        </para>
-        <programlisting role=""><![CDATA[ 
-Sm = [-sI + A   B;
-     [    C     D]
- ]]></programlisting>
-        <para>
-            to linear system in state-space representation (<literal>syslin</literal>) list.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ss2des">ss2des</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/cacsd/help/ru_RU/linear_system_representation/sm2des.xml b/scilab/modules/cacsd/help/ru_RU/linear_system_representation/sm2des.xml
deleted file mode 100644 (file)
index 098bb7a..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 - 
- * 
- * 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="ru" xml:id="sm2des">
-    <refnamediv>
-        <refname>sm2des</refname>
-        <refpurpose>system matrix to descriptor</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[Des]=sm2des(Sm);</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>Sm</term>
-                <listitem>
-                    <para>polynomial matrix (pencil system matrix)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>Des</term>
-                <listitem>
-                    <para>
-                        descriptor system (<literal>list('des',A,B,C,D,E)</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Utility function: converts the system matrix:
-        </para>
-        <programlisting role=""><![CDATA[ 
-Sm = [-sE + A   B;
-     [    C     D]
- ]]></programlisting>
-        <para>
-            to descriptor system <literal>Des=list('des',A,B,C,D,E)</literal>).
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ss2des">ss2des</link>
-            </member>
-            <member>
-                <link linkend="sm2ss">sm2ss</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/cacsd/help/ru_RU/linear_system_representation/sm2ss.xml b/scilab/modules/cacsd/help/ru_RU/linear_system_representation/sm2ss.xml
deleted file mode 100644 (file)
index a4c7368..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 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="ru" xml:id="sm2ss">
-    <refnamediv>
-        <refname>sm2ss</refname>
-        <refpurpose>system matrix to state-space</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>[Sl]=sm2ss(Sm);</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>Sm</term>
-                <listitem>
-                    <para>polynomial matrix (pencil system matrix)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>Sl</term>
-                <listitem>
-                    <para>
-                        linear system (<literal>syslin</literal> list)
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Utility function: converts the system matrix:
-        </para>
-        <programlisting role=""><![CDATA[ 
-Sm = [-sI + A   B;
-     [    C     D]
- ]]></programlisting>
-        <para>
-            to linear system in state-space representation (<literal>syslin</literal>) list.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="ss2des">ss2des</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index cbd32ff..f285b9e 100644 (file)
@@ -2694,3 +2694,11 @@ msgstr ""
 # File: modules/cacsd/macros/zgrid.sci, line: 98
 msgid "Imaginary Axis"
 msgstr ""
+
+#
+# File: modules/cacsd/macros/systmat.sci, line: 30
+#, c-format
+msgid ""
+"%s: Wrong type for input argument #%d: state space or a descriptor "
+"representation expected.\n"
+msgstr ""
index 7c8a13a..8249cc8 100644 (file)
@@ -386,11 +386,3 @@ msgstr ""
 #, c-format
 msgid "%s: Input argument #%d must be real.\n"
 msgstr ""
-
-#
-# File: modules/polynomials/macros/systmat.sci, line: 30
-#, c-format
-msgid ""
-"%s: Wrong type for input argument #%d: state space or a descriptor "
-"representation expected.\n"
-msgstr ""