help pages : misc. improvements 95/19595/8
Samuel GOUGEON [Sat, 9 Dec 2017 16:46:31 +0000 (17:46 +0100)]
Change-Id: Ib538fbd86f96d5a83c00c9b656199f3c18899a86

20 files changed:
scilab/CHANGES.md
scilab/modules/cacsd/help/en_US/matrix_computation/riccati.xml
scilab/modules/cacsd/help/fr_FR/matrix_computation/riccati.xml
scilab/modules/cacsd/help/ja_JP/matrix_computation/riccati.xml
scilab/modules/cacsd/help/pt_BR/matrix_computation/riccati.xml
scilab/modules/cacsd/help/ru_RU/matrix_computation/riccati.xml
scilab/modules/elementary_functions/help/en_US/and_op.xml
scilab/modules/elementary_functions/help/en_US/setoperations/unique.xml
scilab/modules/elementary_functions/help/fr_FR/setoperations/unique.xml
scilab/modules/elementary_functions/help/ja_JP/setoperations/unique.xml
scilab/modules/elementary_functions/help/pt_BR/setoperations/unique.xml
scilab/modules/elementary_functions/help/ru_RU/setoperations/unique.xml
scilab/modules/graphics/help/en_US/2d_plot/polarplot.xml
scilab/modules/graphics/help/en_US/Graphics.xml
scilab/modules/graphics/help/fr_FR/Graphics.xml
scilab/modules/graphics/help/ja_JP/2d_plot/polarplot.xml
scilab/modules/graphics/help/ja_JP/Graphics.xml
scilab/modules/graphics/help/pt_BR/2d_plot/polarplot.xml
scilab/modules/graphics/help/pt_BR/Graphics.xml
scilab/modules/graphics/help/ru_RU/Graphics.xml

index 3a2094d..1372295 100644 (file)
@@ -239,8 +239,8 @@ Help pages:
   `scilab|scilex`, `flipdim`, `Matplot_properties`, `meshgrid`, `ismatrix`, `xget`, `xset`, `ieee`, `evstr`,
   `uigetfont`, `uigetdir`, `uigetfile`, `uiputfile`, `cat`, `makecell`, `xstring`, `norm`, `barhomogenize`
 * rewritten: `consolebox`, `double`, `isoview`, `pixel_drawing_mode`, `householder`, `or`, `|,||`,
-`and`, `&,&&`, `format`, `typeof`, `brackets`, `setlanguage`, `sleep`, `isinf`,
-`bitor`, `bitxor`, `bitand`, `macr2tree`, `geomean`, `clf`, `getPreferencesValue`, `gcd`, `isglobal`, `whereis`, `mode`
+ `and`, `&,&&`, `format`, `typeof`, `brackets`, `setlanguage`, `sleep`, `isinf`, `unique`,
+ `bitor`, `bitxor`, `bitand`, `macr2tree`, `geomean`, `clf`, `getPreferencesValue`, `gcd`, `isglobal`, `whereis`, `mode`
 * reorganized:
   - `else`, `elseif`, `end`, `try`, `sciargs`, `global`, `halt`, `empty`, `power`, `numderivative`
   - `pixel_drawing_mode`, `show_window`, `twinkle`, `uigetcolor`, `winsid`, `xdel`, `xgrid`, `xname`, `xnumb`
index d2c389f..f8692f0 100644 (file)
  * 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="riccati">
+<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="riccati">
     <refnamediv>
         <refname>riccati</refname>
         <refpurpose>Riccati equation</refpurpose>
@@ -120,6 +123,12 @@ H = H*H';
             <member>
                 <link linkend="ric_desc">ric_desc</link>
             </member>
+            <member>
+                <link linkend="srfaur">srfaur</link>
+            </member>
+            <member>
+                <link linkend="lindquist">lindquist</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index a9ea34b..5c8ef9a 100644 (file)
  * 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="fr" xml:id="riccati">
+<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="riccati">
     <refnamediv>
         <refname>riccati</refname>
         <refpurpose>Riccati equation</refpurpose>
@@ -120,6 +123,12 @@ H = H*H';
             <member>
                 <link linkend="ric_desc">ric_desc</link>
             </member>
+            <member>
+                <link linkend="srfaur">srfaur</link>
+            </member>
+            <member>
+                <link linkend="lindquist">lindquist</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 0d09ec5..90826c3 100644 (file)
  * 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="riccati">
+<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="riccati">
     <refnamediv>
         <refname>riccati</refname>
         <refpurpose>リカッチ方程式</refpurpose>
@@ -90,6 +93,12 @@ A'*X*A-(A'*X*B1/(B2+B1'*X*B1))*(B1'*X*A)+C-X
             <member>
                 <link linkend="ric_desc">ric_desc</link>
             </member>
+            <member>
+                <link linkend="srfaur">srfaur</link>
+            </member>
+            <member>
+                <link linkend="lindquist">lindquist</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 4c61be0..3edf54f 100644 (file)
  * 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="riccati">
+<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="riccati">
     <refnamediv>
         <refname>riccati</refname>
         <refpurpose>Riccati equation</refpurpose>
@@ -120,6 +123,12 @@ H = H*H';
             <member>
                 <link linkend="ric_desc">ric_desc</link>
             </member>
+            <member>
+                <link linkend="srfaur">srfaur</link>
+            </member>
+            <member>
+                <link linkend="lindquist">lindquist</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 41a3910..21c1f26 100644 (file)
  * 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="riccati">
+<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="riccati">
     <refnamediv>
         <refname>riccati</refname>
         <refpurpose>Riccati equation</refpurpose>
@@ -120,6 +123,12 @@ H = H*H';
             <member>
                 <link linkend="ric_desc">ric_desc</link>
             </member>
+            <member>
+                <link linkend="srfaur">srfaur</link>
+            </member>
+            <member>
+                <link linkend="lindquist">lindquist</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 5d3b0c9..e4a070b 100644 (file)
                     <para>
                         For any boolean or numerical operands <varname>U</varname> and
                         <varname>V</varname>, <code>G = U &amp;&amp; V</code> is equivalent to
-                        <code>if ~and(U), G = %F, else G = and(V), end</code>.
+                        <literal>if ~and(U), G = %F, else G = and(V), end</literal>.
                         <itemizedlist>
                             <listitem>
                               <varname>U</varname> and <varname>V</varname> may have distinct sizes
@@ -352,7 +352,7 @@ det: Wrong type for input argument #1: Square matrix expected.
     <programlisting role="example"><![CDATA[
 p = 1 + 0*%z
 typeof(p)
-p &amp; 1
+p & 1
  ]]></programlisting>
     <screen><![CDATA[
 --> p = 1 + 0*%z
@@ -363,7 +363,7 @@ p &amp; 1
  ans  =
  polynomial
 
---> p &amp; 1
+--> p & 1
 Undefined operation for the given operands.
 check or define function %p_h_s for overloading.
 ]]></screen>
index f221cdb..af55985 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * 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="unique" xml:lang="en">
+<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="unique" xml:lang="en">
     <refnamediv>
         <refname>unique</refname>
-        <refpurpose>remove all duplicate components of a vector or a matrix</refpurpose>
+        <refpurpose>extracts (and sorts) distinct components of a vector or a matrix</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
             [N ,k] = unique(M)
-            [N ,k] = unique(M ,orient)
+            [N ,k] = unique(M, orient)
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
@@ -31,7 +35,7 @@
             <varlistentry>
                 <term>M</term>
                 <listitem>
-                    <para>vector or matrix of numbers or strings</para>
+                    <para>vector or matrix of numbers or strings.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             <varlistentry>
                 <term>N</term>
                 <listitem>
-                    <para>vector or matrix of numbers or strings</para>
+                    <para>
+                      <itemizedlist>
+                        <listitem>
+                          If <varname>orient</varname> is not used: Vector of extracted
+                          <varname>M</varname> components sorted in ascending order.
+                        </listitem>
+                        <listitem>
+                          If <varname>orient</varname> is used: Matrix of extracted
+                          <varname>M</varname> rows or columns, sorted in lexicographic ascending order.
+                        </listitem>
+                      </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>k</term>
                 <listitem>
-                    <para>vector of integers</para>
+                    <para>
+                      Vector of indices of first encountered occurences, such that
+                      <literal>N(i) = M(k(i))</literal> or <literal>N(i,:) = M(k(i),:)</literal>
+                      or <literal>N(:,i) = M(:,k(i))</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
             unique entries of <literal>M</literal> in ascending order.
         </para>
         <para>
-            <literal>unique(M,"r")</literal> or
-            <literal>unique(M,1)</literal>returns the unique rows of
-            <literal>M</literal> in lexicographic ascending order.
+            <literal>unique(M,"r")</literal> or  <literal>unique(M,1)</literal> removes all
+            duplicates of <varname>M</varname> rows and returns unique rows  in lexicographic
+            ascending order.
         </para>
         <para>
-            <literal>unique(M,"c")</literal> or
-            <literal>unique(M,2)</literal>returns the unique columns of
-            <literal>M</literal> in lexicographic ascending order.
-        </para>
-        <para>
-            If required the output argument <literal>k</literal> contains the
-            position of the first encountered unique entries.
+            <literal>unique(M,"c")</literal> or  <literal>unique(M,2)</literal> removes all
+            duplicates of <varname>M</varname> columns and returns unique columns in lexicographic
+            ascending order.
         </para>
+        <note>
+          Extracted components, rows or columns can be resorted in their initial order by sorting
+          <varname>k</varname>:
+          <programlisting role="no-example"><![CDATA[
+              [N, k] = unique(M);      k = gsort(k,"g",i); N = N(k)
+              [N, k] = unique(M, "c"); k = gsort(k,"g",i); N = N(:, k)
+              [N, k] = unique(M, "r"); k = gsort(k,"g",i); N = N(k, :)
+          ]]></programlisting>
+        </note>
     </refsection>
     <refsection role="examples">
         <title>Examples</title>
@@ -114,6 +138,12 @@ unique(A,'c')
                 <link linkend="gsort">gsort</link>
             </member>
             <member>
+                <link linkend="vectorfind">vectorfind</link>
+            </member>
+            <member>
+                <link linkend="grep">grep</link>
+            </member>
+            <member>
                 <link linkend="union">union</link>
             </member>
             <member>
index a6dbeb1..426a077 100644 (file)
@@ -1,15 +1,33 @@
 <?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="unique" xml:lang="fr">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
+ *
+ * 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="unique" xml:lang="fr">
     <refnamediv>
         <refname>unique</refname>
-        <refpurpose>supprime tous les éléments en doublon dans un vecteur ou une matrice
+        <refpurpose>extrait (et trie) tous les éléments distincts d'un vecteur ou d'une matrice
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
         <synopsis>
             [N [,k]] = unique(M)
-            [N [,k]] = unique(M,orient)
+            [N [,k]] = unique(M, orient)
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
@@ -18,7 +36,7 @@
             <varlistentry>
                 <term>M</term>
                 <listitem>
-                    <para>vecteur ou matrice de nombres ou de chaînes de caractères
+                    <para>vecteur ou matrice de nombres ou de textes.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>N</term>
                 <listitem>
-                    <para>vecteur ou matrice de nombres ou de chaînes de
-                        caractères
+                    <para>
+                      <itemizedlist>
+                        <listitem>
+                          Sans <varname>orient</varname>: vecteur d'éléments de <varname>M</varname>
+                          triés par ordre croissant.
+                        </listitem>
+                        <listitem>
+                          Avec <varname>orient</varname>: Matrice de lignes ou colonnes extraites de
+                          <varname>M</varname>, triées par ordre lexicographique croissant.
+                        </listitem>
+                      </itemizedlist>
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>k</term>
                 <listitem>
-                    <para>vecteur d'entiers</para>
+                    <para>
+                      Indices des éléments, lignes ou colonnes extraits, tels que
+                      <literal>N(i) = M(k(i))</literal> ou <literal>N(i,:) = M(k(i),:)</literal>
+                      ou <literal>N(:,i) = M(:,k(i))</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <literal>unique(M,2)</literal>retourne les colonnes uniques
             <literal>M</literal> triées dans l'ordre lexicographique croissant.
         </para>
-        <para>
-            S'il est présent l'argument de sortie <literal>k</literal> contient
-            la position de la première occurrence de chaque valeur distincte dans
-            <literal>M</literal>.
-        </para>
+        <note>
+          Les éléments, lignes ou colonnes extraits peuvent être remis dans leur ordre d'origine en
+          triant <varname>k</varname> :
+          <programlisting role="no-example"><![CDATA[
+              [N, k] = unique(M);      k = gsort(k,"g",i); N = N(k)
+              [N, k] = unique(M, "c"); k = gsort(k,"g",i); N = N(:, k)
+              [N, k] = unique(M, "r"); k = gsort(k,"g",i); N = N(k, :)
+          ]]></programlisting>
+        </note>
     </refsection>
     <refsection role="examples">
         <title>Exemples</title>
@@ -106,6 +141,12 @@ unique(A,'c')
                 <link linkend="gsort">gsort</link>
             </member>
             <member>
+                <link linkend="vectorfind">vectorfind</link>
+            </member>
+            <member>
+                <link linkend="grep">grep</link>
+            </member>
+            <member>
                 <link linkend="union">union</link>
             </member>
             <member>
index fa69b05..1bed8bd 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * 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="unique" xml:lang="ja">
+<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="unique" xml:lang="ja">
     <refnamediv>
         <refname>unique</refname>
         <refpurpose>ベクトルまたは行列のユニークなな要素を展開</refpurpose>
@@ -22,7 +26,7 @@
         <title>呼び出し手順</title>
         <synopsis>
             [N ,k] = unique(M)
-            [N ,k] = unique(M ,orient)
+            [N ,k] = unique(M, orient)
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
             <varlistentry>
                 <term>N</term>
                 <listitem>
-                    <para>数値または文字列のベクトルまたは行列</para>
+                    <para>
+                      <itemizedlist>
+                        <listitem>
+                          If <varname>orient</varname> is not used: Vector of extracted
+                          <varname>M</varname> components sorted in ascending order.
+                        </listitem>
+                        <listitem>
+                          If <varname>orient</varname> is used: Matrix of extracted
+                          <varname>M</varname> rows or columns, sorted in lexicographic ascending order.
+                        </listitem>
+                      </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>k</term>
                 <listitem>
-                    <para>整数のベクトル</para>
+                    <para>
+                      Vector of indices of first encountered occurences, such that
+                      <literal>N(i) = M(k(i))</literal> or <literal>N(i,:) = M(k(i),:)</literal>
+                      or <literal>N(:,i) = M(:,k(i))</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <literal>M</literal>のユニークな列を
             辞書式の昇順にして返します.
         </para>
-        <para>
-            出力引数<literal>k</literal>が指定された場合,
-            ユニークなエントリが最初に現れた最初の位置が
-            代入されます.
-        </para>
+        <note>
+          Extracted components, rows or columns can be resorted in their initial order by sorting
+          <varname>k</varname>:
+          <programlisting role="no-example"><![CDATA[
+              [N, k] = unique(M);      k = gsort(k,"g",i); N = N(k)
+              [N, k] = unique(M, "c"); k = gsort(k,"g",i); N = N(:, k)
+              [N, k] = unique(M, "r"); k = gsort(k,"g",i); N = N(k, :)
+          ]]></programlisting>
+        </note>
     </refsection>
     <refsection role="examples">
         <title>例</title>
@@ -115,6 +138,12 @@ unique(A,'c')
                 <link linkend="gsort">gsort</link>
             </member>
             <member>
+                <link linkend="vectorfind">vectorfind</link>
+            </member>
+            <member>
+                <link linkend="grep">grep</link>
+            </member>
+            <member>
                 <link linkend="union">union</link>
             </member>
             <member>
index dfebdbe..2b41882 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * 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: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="unique" xml:lang="pt">
+<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="unique" xml:lang="pt">
     <refnamediv>
         <refname>unique</refname>
         <refpurpose>remover todos os componentes duplicados de um vetor ou uma matriz
@@ -23,7 +27,7 @@
         <title>Seqüência de Chamamento</title>
         <synopsis>
             [N ,k] = unique(M)
-            [N ,k] = unique(M ,orient)
+            [N ,k] = unique(M, orient)
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
             <varlistentry>
                 <term>N</term>
                 <listitem>
-                    <para>vetor ou matriz de números ou strings </para>
+                    <para>
+                      <itemizedlist>
+                        <listitem>
+                          If <varname>orient</varname> is not used: Vector of extracted
+                          <varname>M</varname> components sorted in ascending order.
+                        </listitem>
+                        <listitem>
+                          If <varname>orient</varname> is used: Matrix of extracted
+                          <varname>M</varname> rows or columns, sorted in lexicographic ascending order.
+                        </listitem>
+                      </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>k</term>
                 <listitem>
-                    <para>vetor de inteiros</para>
+                    <para>
+                      Vector of indices of first encountered occurences, such that
+                      <literal>N(i) = M(k(i))</literal> or <literal>N(i,:) = M(k(i),:)</literal>
+                      or <literal>N(:,i) = M(:,k(i))</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <literal>unique(M,2)</literal>retorna as linhas únicas de
             <literal>M</literal> em ordem lexicográfica ascendente.
         </para>
-        <para>
-            Se requerido, o argumento de saída, <literal>k</literal> contém a
-            posição das primeiras entradas únicas encontradas.
-        </para>
+        <note>
+          Extracted components, rows or columns can be resorted in their initial order by sorting
+          <varname>k</varname>:
+          <programlisting role="no-example"><![CDATA[
+              [N, k] = unique(M);      k = gsort(k,"g",i); N = N(k)
+              [N, k] = unique(M, "c"); k = gsort(k,"g",i); N = N(:, k)
+              [N, k] = unique(M, "r"); k = gsort(k,"g",i); N = N(k, :)
+          ]]></programlisting>
+        </note>
     </refsection>
     <refsection role="description">
         <title>Exemplos</title>
@@ -114,6 +138,12 @@ unique(A,'c')
                 <link linkend="gsort">gsort</link>
             </member>
             <member>
+                <link linkend="vectorfind">vectorfind</link>
+            </member>
+            <member>
+                <link linkend="grep">grep</link>
+            </member>
+            <member>
                 <link linkend="union">union</link>
             </member>
             <member>
index ec75922..e48bbf5 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * 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="unique" xml:lang="ru">
+<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="unique" xml:lang="ru">
     <refnamediv>
         <refname>unique</refname>
         <refpurpose>удалить все повторяющиеся компоненты из вектора или матрицы</refpurpose>
             <varlistentry>
                 <term>N</term>
                 <listitem>
-                    <para>вектор или матрица чисел или строк</para>
+                    <para>
+                      <itemizedlist>
+                        <listitem>
+                          Если <varname>orient</varname> не используется: вектор извлечённых
+                          <varname>M</varname> компонентов, сортированных в полядке возрастания.
+                        </listitem>
+                        <listitem>
+                          Если <varname>orient</varname> используется: матрица извлечённых
+                          <varname>M</varname> строк или столбцов, сортированных в лексикографическом порядке возрастания.
+                        </listitem>
+                      </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>k</term>
                 <listitem>
-                    <para>вектор целых чисел</para>
+                    <para>
+                      Вектор индексов первых встреченных значений, таких что
+                      <literal>N(i) = M(k(i))</literal> или <literal>N(i,:) = M(k(i),:)</literal>
+                      или <literal>N(:,i) = M(:,k(i))</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <literal>unique(M,"c")</literal> или <literal>unique(M,2)</literal> возвращает
             уникальные столбцы <literal>M</literal> в лексикографическом порядке возрастания.
         </para>
-        <para>
-            Если нужно, выходной аргумент <literal>k</literal> содержит положение первых из насчитанных уникальных элементов.
-        </para>
+        <note>
+          Извлечённые компоненты, строки или столбцы могут быть пересортированны в их исходном порядке через
+          сортировку с помощью <varname>k</varname>:
+          <programlisting role="no-example"><![CDATA[
+              [N, k] = unique(M);      k = gsort(k,"g",i); N = N(k)
+              [N, k] = unique(M, "c"); k = gsort(k,"g",i); N = N(:, k)
+              [N, k] = unique(M, "r"); k = gsort(k,"g",i); N = N(k, :)
+          ]]></programlisting>
+        </note>
     </refsection>
     <refsection role="examples">
         <title>Примеры</title>
@@ -109,6 +134,12 @@ unique(A,'c')
                 <link linkend="gsort">gsort</link>
             </member>
             <member>
+                <link linkend="vectorfind">vectorfind</link>
+            </member>
+            <member>
+                <link linkend="grep">grep</link>
+            </member>
+            <member>
                 <link linkend="union">union</link>
             </member>
             <member>
index de360b3..68122b6 100644 (file)
  * 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="polarplot">
+<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="polarplot">
     <refnamediv>
         <refname>polarplot</refname>
         <refpurpose>Plot polar
     <refsection>
         <title>Example 1</title>
         <programlisting role="example"><![CDATA[
-t= 0:.01:2*%pi;
-clf();polarplot(sin(7*t),cos(8*t))
+clf
+t = 0:.01:2*%pi;
+polarplot(sin(7*t),cos(8*t))
  ]]></programlisting>
         <scilab:image>
             t= 0:.01:2*%pi;
@@ -283,9 +287,9 @@ clf();polarplot(sin(7*t),cos(8*t))
     <refsection>
         <title>Example 2</title>
         <programlisting role="example"><![CDATA[
-t= 0:.01:2*%pi;
-
-clf();polarplot([sin(7*t') sin(6*t')],[cos(8*t') cos(8*t')],[1,2])
+t = 0:.01:2*%pi;
+clf
+polarplot([sin(7*t') sin(6*t')],[cos(8*t') cos(8*t')],[1,2])
  ]]></programlisting>
         <scilab:image>
             t= 0:.01:2*%pi;
@@ -307,12 +311,11 @@ polarplot(t, -1 + sin(t));
     <refsection>
         <title>Example 4</title>
         <programlisting role="example"><![CDATA[
-  clf()
-  isoview()
-  theta=[0:0.02:2*%pi]';
-  rho=1+0.2*cos(theta.^2)
-  polarplot(theta,rho,style=5)
-  gca().data_bounds=[-1.2,-1.2;1.2,01.2;
+clf
+theta = [0:0.02:2*%pi]';
+rho = 1+0.2*cos(theta.^2);
+polarplot(theta,rho,style=5)
+gca().data_bounds = [-1.2,-1.2;1.2,01.2];
  ]]></programlisting>
         <scilab:image>
             theta=[0:0.02:2*%pi]';
index f1885e5..580e33d 100644 (file)
  * 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" scilab:needs-examples="no" xml:id="Graphics">
+<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" scilab:needs-examples="no" xml:id="Graphics">
     <refnamediv>
         <refname>Graphics: Getting started</refname>
         <refpurpose>graphics library overview</refpurpose>
                 </term>
                 <listitem>
                     <para>
-                        Set scales for isometric plot (do not change the size
-                        of the window)
-                        <warning>
-                            This function is obsolete.
-                        </warning>
+                        Set isometric plotting scales
                     </para>
                 </listitem>
             </varlistentry>
index 6203759..381bab5 100644 (file)
  * 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="Graphics" xml:lang="fr">
+<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="Graphics" xml:lang="fr">
     <refnamediv>
         <refname>Graphics</refname>
         <refpurpose>contenu de la bibliothèque graphique</refpurpose>
                     <link linkend="isoview">isoview</link>
                 </term>
                 <listitem>
-                    <para>échelle isométrique (fonction obsolète)</para>
+                    <para>échelles graphiques isométriques</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index 1051176..b78124a 100644 (file)
  * 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="polarplot">
+<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="polarplot">
     <refnamediv>
         <refname>polarplot</refname>
         <refpurpose>極座標プロット</refpurpose>
     <refsection role="examples">
         <title>例1</title>
         <programlisting role="example"><![CDATA[
-t= 0:.01:2*%pi;
-clf();polarplot(sin(7*t),cos(8*t))
+t = 0:.01:2*%pi;
+clf
+polarplot(sin(7*t),cos(8*t))
  ]]></programlisting>
         <scilab:image>
             t= 0:.01:2*%pi;
@@ -276,8 +280,9 @@ clf();polarplot(sin(7*t),cos(8*t))
     <refsection role="examples">
         <title>例2</title>
         <programlisting role="example"><![CDATA[
-t= 0:.01:2*%pi;
-clf();polarplot([sin(7*t') sin(6*t')],[cos(8*t') cos(8*t')],[1,2])
+t = 0:.01:2*%pi;
+clf
+polarplot([sin(7*t') sin(6*t')],[cos(8*t') cos(8*t')],[1,2])
  ]]></programlisting>
         <scilab:image>
             t= 0:.01:2*%pi;
@@ -298,19 +303,18 @@ polarplot(t, -1 + sin(t));
     <refsection role="examples">
         <title>例4</title>
         <programlisting role="example"><![CDATA[
-  clf()
-  theta = [0:0.02:2*%pi]';
-  rho = 1+0.2*cos(theta.^2);
-  polarplot(theta,rho,style=5)
-  isoview()
-  gca().data_bounds = [-1.2,-1.2;1.2,01.2];
- ]]></programlisting>
-        <scilab:image>
-            theta=[0:0.02:2*%pi]';
-            rho=1+0.2*cos(theta.^2)
-            polarplot(theta,rho,style=5)
-            isoview()
-            gca().data_bounds=[-1.2,-1.2;1.2,01.2]
-        </scilab:image>
+clf
+theta = [0:0.02:2*%pi]';
+rho = 1+0.2*cos(theta.^2);
+polarplot(theta, rho, style=5)
+gca().data_bounds = [-1.2,-1.2 ; 1.2,01.2];
+]]></programlisting>
+      <scilab:image>
+        theta=[0:0.02:2*%pi]';
+        rho=1+0.2*cos(theta.^2)
+        polarplot(theta,rho,style=5)
+        isoview()
+        gca().data_bounds=[-1.2,-1.2;1.2,01.2]
+      </scilab:image>
     </refsection>
 </refentry>
index 0457d57..59ec1d9 100644 (file)
  * 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="Graphics">
+<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="Graphics">
     <refnamediv>
         <refname>Graphics: Getting started</refname>
         <refpurpose>グラフィックライブラリの概要</refpurpose>
                     <link linkend="isoview">isoview</link>
                 </term>
                 <listitem>
-                    <para>等軸プロットにスケールを設定 (ウインドウの大きさは変更されません)</para>
+                    <para>等軸プロットにスケールを設定</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index 6940e40..08ed7c6 100644 (file)
  * 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: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="polarplot" xml:lang="pt">
+<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="polarplot" xml:lang="pt">
     <refnamediv>
         <refname>polarplot</refname>
         <refpurpose>Esboço de coordenadas polares</refpurpose>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-t= 0:.01:2*%pi;
-clf();polarplot(sin(7*t),cos(8*t))
+t = 0:.01:2*%pi;
+clf
+polarplot(sin(7*t),cos(8*t))
 
 clf();polarplot([sin(7*t') sin(6*t')],[cos(8*t') cos(8*t')],[1,2])
  ]]></programlisting>
index 21315fe..a7e4fb0 100644 (file)
             <varlistentry>
                 <term>isoview</term>
                 <listitem>
-                    <para>ajusta escalas para esboço isométrico (não muda o tamanho da
-                        janela)
+                    <para>ajusta escalas para esboço isométrico
                     </para>
                 </listitem>
             </varlistentry>
index 58ed0f6..b9a6069 100644 (file)
  * 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="Graphics">
+<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="Graphics">
     <refnamediv>
         <refname>Графики: введение</refname>
         <refpurpose>обзор библиотеки графиков</refpurpose>
                 </term>
                 <listitem>
                     <para>
-                        Проекция из трёхмерного построения на двумерное после того, как трёхмерное построено
+                        Проекция из трёхмерного построения на двумерное после того, как трёхмерное построено.
                     </para>
                     <para>
                         <emphasis role="bold">Пример:</emphasis>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Rectangle plotting</title>
+        <title>Построение прямоугольника</title>
         <variablelist>
             <varlistentry>
                 <term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Arc plotting</title>
+        <title>Построение дуги</title>
         <variablelist>
             <varlistentry>
                 <term>
                 </term>
                 <listitem>
                     <para>
-                        Установка равного масштаба осей графика (не меняет размер окна)
-                        <warning>
-                            Эта функция устарела.
-                        </warning>
+                        Установка равного масштаба осей графика
                     </para>
                 </listitem>
             </varlistentry>