help: misc. typos and small improvements (no image changed) 51/19051/5
Samuel GOUGEON [Tue, 7 Feb 2017 23:55:44 +0000 (00:55 +0100)]
Change-Id: I396772f71e87d497c871158f260c2e37560b2dc4

26 files changed:
scilab/modules/core/help/en_US/2_control_flow/else.xml
scilab/modules/core/help/en_US/scilab.xml
scilab/modules/core/help/en_US/variables/predefined/SCI.xml
scilab/modules/core/help/fr_FR/2_control_flow/else.xml
scilab/modules/core/help/fr_FR/scilab.xml
scilab/modules/core/help/ja_JP/2_control_flow/else.xml
scilab/modules/core/help/ja_JP/scilab.xml
scilab/modules/core/help/ja_JP/variables/predefined/SCI.xml
scilab/modules/core/help/pt_BR/2_control_flow/else.xml
scilab/modules/core/help/pt_BR/scilab.xml
scilab/modules/core/help/ru_RU/2_control_flow/else.xml
scilab/modules/core/help/ru_RU/scilab.xml
scilab/modules/core/help/ru_RU/variables/predefined/SCI.xml
scilab/modules/coverage/help/en_US/covStart.xml
scilab/modules/coverage/help/en_US/covWrite.xml
scilab/modules/elementary_functions/help/en_US/ismatrix.xml
scilab/modules/elementary_functions/help/ja_JP/ismatrix.xml
scilab/modules/graphics/help/en_US/2d_plot/scatter.xml
scilab/modules/graphics/help/en_US/3d_plot/scatter3.xml
scilab/modules/graphics/help/en_US/axes_operations/subplot.xml
scilab/modules/graphics/help/fr_FR/axes_operations/subplot.xml
scilab/modules/string/help/en_US/prettyprint.xml [moved from scilab/modules/output_stream/help/en_US/prettyprint.xml with 100% similarity]
scilab/modules/string/help/ja_JP/prettyprint.xml [moved from scilab/modules/output_stream/help/ja_JP/prettyprint.xml with 100% similarity]
scilab/modules/string/macros/prettyprint.sci [moved from scilab/modules/output_stream/macros/prettyprint.sci with 100% similarity]
scilab/modules/string/tests/unit_tests/prettyprint.dia.ref [moved from scilab/modules/output_stream/tests/unit_tests/prettyprint.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/prettyprint.tst [moved from scilab/modules/output_stream/tests/unit_tests/prettyprint.tst with 100% similarity]

index c7744f5..c529a8f 100644 (file)
@@ -35,11 +35,20 @@ end
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="elseif">elseif</link>
+            </member>
+            <member>
                 <link linkend="if">if</link>
             </member>
             <member>
                 <link linkend="select">select</link>
             </member>
+            <member>
+                <link linkend="and_op">&amp;, &amp;&amp;</link>
+            </member>
+            <member>
+                <link linkend="or_op">|, ||</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 71ad5fe..e71ae54 100644 (file)
@@ -480,7 +480,7 @@ echo $? ]]></screen>
                 <link linkend="getenv">getenv</link>
             </member>
             <member>
-                <link linkend="getenv">getversion</link>
+                <link linkend="getversion">getversion</link>
             </member>
             <member>
                 <link linkend="consolebox">consolebox</link>
index 1eae352..0ee4a5d 100644 (file)
@@ -15,9 +15,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: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="SCI" xml:lang="en">
     <refnamediv>
-        <refname>SCI</refname>
-        <refpurpose>variable containing the value of the root path of
-            Scilab.
+        <refname>SCI, WSCI</refname>
+        <refpurpose>variable containing the value of the root path of Scilab.
         </refpurpose>
     </refnamediv>
     <refsection>
             The <literal>SCI</literal> constant variable contains the value of
             the root path of Scilab.
         </para>
+        <para>
+            For MSWindows users, <literal>SCI</literal> is the
+            <emphasis role="italic">short MSDOS-like</emphasis> version of the
+            path to the Scilab installation directory. When needed, the long version of the path
+            is available from the <literal>WSCI</literal> constant variable. It is equal to
+           <literal>getlongpathname(SCI)</literal>.
+        </para>
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -39,12 +45,19 @@ cd(SCI)
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="TMPDIR">TMPDIR</link>
+            </member>
+            <member>
                 <link linkend="SCIHOME">SCIHOME</link>
             </member>
-        </simplelist>
-        <simplelist type="inline">
             <member>
-                <link linkend="TMPDIR">TMPDIR</link>
+                <link linkend="home">home</link>
+            </member>
+            <member>
+                <link linkend="pwd">pwd</link>
+            </member>
+            <member>
+                <link linkend="getlongpathname">getlongpathname</link>
             </member>
         </simplelist>
     </refsection>
index a13bdf1..9ad41d3 100644 (file)
@@ -35,11 +35,20 @@ end
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
+                <link linkend="elseif">elseif</link>
+            </member>
+            <member>
                 <link linkend="if">if</link>
             </member>
             <member>
                 <link linkend="select">select</link>
             </member>
+            <member>
+                <link linkend="and_op">&amp;, &amp;&amp;</link>
+            </member>
+            <member>
+                <link linkend="or_op">|, ||</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index f57ee2b..2e3b824 100644 (file)
@@ -495,7 +495,7 @@ echo $? ]]></screen>
                 <link linkend="getenv">getenv</link>
             </member>
             <member>
-                <link linkend="getenv">getversion</link>
+                <link linkend="getversion">getversion</link>
             </member>
             <member>
                 <link linkend="consolebox">consolebox</link>
index 156ee2b..26e3469 100644 (file)
@@ -52,19 +52,21 @@ end
         <title>参照</title>
 
         <simplelist type="inline">
-
             <member>
-
+                <link linkend="elseif">elseif</link>
+            </member>
+            <member>
                 <link linkend="if">if</link>
-
             </member>
-
             <member>
-
                 <link linkend="select">select</link>
-
             </member>
-
+            <member>
+                <link linkend="and_op">&amp;, &amp;&amp;</link>
+            </member>
+            <member>
+                <link linkend="or_op">|, ||</link>
+            </member>
         </simplelist>
 
     </refsection>
index 6d91427..ba7b150 100644 (file)
@@ -495,7 +495,7 @@ echo $? ]]></screen>
                 <link linkend="getenv">getenv</link>
             </member>
             <member>
-                <link linkend="getenv">getversion</link>
+                <link linkend="getversion">getversion</link>
             </member>
             <member>
                 <link linkend="consolebox">consolebox</link>
index 0ca2910..e9a81eb 100644 (file)
@@ -15,7 +15,7 @@
  -->
 <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="SCI" xml:lang="ja">
     <refnamediv>
-        <refname>SCI</refname>
+        <refname>SCI, WSCI</refname>
         <refpurpose>Scilabのルートパスの値を有する変数.</refpurpose>
     </refnamediv>
     <refsection>
         <para>
             定数変数<literal>SCI</literal>はScilabのルートパスの値を有します.
         </para>
+        <para>
+            For MSWindows users, <literal>SCI</literal> is the
+            <emphasis role="italic">short MSDOS-like</emphasis> version of the
+            path to the Scilab installation directory. When needed, the long version of the path
+            is available from the <literal>WSCI</literal> constant variable. It is equal to
+           <literal>getlongpathname(SCI)</literal>.
+        </para>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
         <simplelist type="inline">
             <member>
+                <link linkend="TMPDIR">TMPDIR</link>
+            </member>
+            <member>
                 <link linkend="SCIHOME">SCIHOME</link>
             </member>
-        </simplelist>
-        <simplelist type="inline">
             <member>
-                <link linkend="TMPDIR">TMPDIR</link>
+                <link linkend="home">home</link>
+            </member>
+            <member>
+                <link linkend="pwd">pwd</link>
+            </member>
+            <member>
+                <link linkend="getlongpathname">getlongpathname</link>
             </member>
         </simplelist>
     </refsection>
index 8d18381..a262e4d 100644 (file)
@@ -3,11 +3,11 @@
     <refnamediv>
         <refname>else</refname>
         <refpurpose>palavra-chave usada na estrutura "if-then-else" (significa
-            "senão...")
+            "senão...")
         </refpurpose>
     </refnamediv>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
             Usado com <literal>if</literal>.
         </para>
@@ -25,11 +25,20 @@ end
      ]]></programlisting>
     </refsection>
     <refsection>
-        <title> Ver Também </title>
+        <title> Ver Também </title>
         <simplelist type="inline">
             <member>
+                <link linkend="elseif">elseif</link>
+            </member>
+            <member>
                 <link linkend="if">if</link>
             </member>
+            <member>
+                <link linkend="and_op">&amp;, &amp;&amp;</link>
+            </member>
+            <member>
+                <link linkend="or_op">|, ||</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 150f652..fe975f9 100644 (file)
@@ -420,7 +420,7 @@ echo $? ]]></screen>
                 <link linkend="getenv">getenv</link>
             </member>
             <member>
-                <link linkend="getenv">getversion</link>
+                <link linkend="getversion">getversion</link>
             </member>
             <member>
                 <link linkend="consolebox">consolebox</link>
index 91686cc..9c10302 100644 (file)
@@ -35,11 +35,20 @@ end
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
+                <link linkend="elseif">elseif</link>
+            </member>
+            <member>
                 <link linkend="if">if</link>
             </member>
             <member>
                 <link linkend="select">select</link>
             </member>
+            <member>
+                <link linkend="and_op">&amp;, &amp;&amp;</link>
+            </member>
+            <member>
+                <link linkend="or_op">|, ||</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 9e755d8..4fced1a 100644 (file)
@@ -81,8 +81,6 @@ evstr(a(i+2))*2
 --> "Эта сессия была запущена из " + a(i+3)
  ans  =
  Эта сессия была запущена из "C:\Users\Me"
-
--->
 ]]></screen>
                      </para>
                      <para>
@@ -509,7 +507,7 @@ echo $? ]]></screen>
                 <link linkend="getenv">getenv</link>
             </member>
             <member>
-                <link linkend="getenv">getversion</link>
+                <link linkend="getversion">getversion</link>
             </member>
             <member>
                 <link linkend="consolebox">consolebox</link>
index efd42f7..0a2249a 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="SCI" 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: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="SCI" xml:lang="ru">
     <refnamediv>
-        <refname>SCI</refname>
+        <refname>SCI, WSCI</refname>
         <refpurpose>переменная, содержащая путь до системных файлов Scilab'а.
         </refpurpose>
     </refnamediv>
         <para>
             Неизменная переменная <literal>SCI</literal> хранит значение пути до системных файлов Scilab'а.
         </para>
+        <para>
+            For MSWindows users, <literal>SCI</literal> is the
+            <emphasis role="italic">short MSDOS-like</emphasis> version of the
+            path to the Scilab installation directory. When needed, the long version of the path
+            is available from the <literal>WSCI</literal> constant variable. It is equal to
+           <literal>getlongpathname(SCI)</literal>.
+        </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
@@ -37,12 +47,19 @@ cd(SCI)
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
+                <link linkend="TMPDIR">TMPDIR</link>
+            </member>
+            <member>
                 <link linkend="SCIHOME">SCIHOME</link>
             </member>
-        </simplelist>
-        <simplelist type="inline">
             <member>
-                <link linkend="TMPDIR">TMPDIR</link>
+                <link linkend="home">home</link>
+            </member>
+            <member>
+                <link linkend="pwd">pwd</link>
+            </member>
+            <member>
+                <link linkend="getlongpathname">getlongpathname</link>
             </member>
         </simplelist>
     </refsection>
index 0e31ca0..14fb656 100644 (file)
@@ -6,11 +6,13 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>covStart(paths)</synopsis>
-        <synopsis>covStart(lib)</synopsis>
-        <synopsis>covStart([path ; lib])</synopsis>
-        <synopsis>covStart(macro)</synopsis>
-        <synopsis>covStart("all")</synopsis>
+        <synopsis>
+          covStart(paths
+          covStart(lib)
+          covStart([path ; lib])
+          covStart(macro)
+          covStart("all")
+       </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index 9566b2f..d43a104 100644 (file)
@@ -6,9 +6,11 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>covWrite("html", dir)</synopsis>
-        <synopsis>covWrite("binary", binaryFile)</synopsis>
-        <synopsis>covWrite("html", binaryFile, dir)</synopsis>
+        <synopsis>
+          covWrite("html", dir)
+          covWrite("binary", binaryFile)
+          covWrite("html", binaryFile, dir)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index 0e15022..d08c11c 100644 (file)
@@ -62,7 +62,7 @@
               are the sizes of its dimensions --, use simply <literal>ndims(x)&lt;3</literal>.
             </listitem>
             <listitem>
-              <literal>matrix([])</literal> returns false.
+              <literal>ismatrix([])</literal> returns false.
             </listitem>
           </itemizedlist>
         </note>
index b73fc47..63c579b 100644 (file)
@@ -96,7 +96,7 @@
               are the sizes of its dimensions --, use simply <literal>ndims(x)&lt;3</literal>.
             </listitem>
             <listitem>
-              <literal>matrix([])</literal>はfalseを返します.
+              <literal>ismatrix([])</literal>はfalseを返します.
             </listitem>
           </itemizedlist>
         </note>
index afa3781..7ddc511 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="scatter">
+<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="scatter">
     <refnamediv>
         <refname>scatter</refname>
         <refpurpose>2D scatter plot</refpurpose>
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            p = scatter(x,y,&lt;s&gt;,&lt;c&gt;,&lt;"fill"&gt;,&lt;marker&gt;,&lt;marker_property,value&gt;)
-            p = scatter(&lt;axes_handle&gt;,...)
+            polyline = scatter(x, y, msizes, mcolors, "fill", marker, &lt;marker_property, value&gt;)
+            polyline = scatter(axes_handle,...)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>x</term>
+                <term>x, y</term>
                 <listitem>
                     <para>
-                        A column or row vector of n real numbers
-                        specifying the x positions of the markers center.
-                        x and y must be vectors of the same length.
+                        Columns or rows vectors of n real numbers specifying the abscissae and the
+                        ordinates of the centers of markers.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>y</term>
+                <term>msizes</term>
                 <listitem>
                     <para>
-                        A column or row vector of n real numbers
-                        specifying the y positions of the markers center.
-                        x and y must be vectors of the same length.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>&lt;s&gt;</term>
-                <listitem>
-                    <para>
-                        Specifying the sizes of the markers.
-                        To plot each marker with equal size, specify s as a scalar.
-                        To plot each marker with a different size, specify s as a vector with length equal to the length of x and y.
-                        The units for s is points squared with a default value of 36 points squared.
+                        Specifying the sizes of the markers. To plot each marker with equal sizes,
+                        specify <varname>msizes</varname> as a scalar.
+                        To plot each marker with a different size, specify <varname>msizes</varname>
+                        as a vector with length equal to the length of <varname>x</varname> and
+                        <varname>x</varname>.
+                        The units for <varname>msizes</varname> is points squared with a default
+                        value of 36 points squared.
                         The size equals the area of the circle surrounding the marker.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;c&gt;</term>
+                <term>mcolors</term>
                 <listitem>
                     <para>
                         Specifying the colors of the markers.
-                        To plot each marker with the same color, specify c as a string representing a known color, see <link linkend="color_list">color_list</link>.
-                        A color can also be specified by a vector of 3 RGB values.
-                        RGB values correspond to red, green and blue intensity between 0 and 1.
-                        To plot each marker with a different color, specify c as a vector with length equal to the length of x and y.
-                        The values of c are linarly mapped to the colors in the current colormap.
-                        Colors can also by specified by a matrix of RGB values or a vector of strings representing known colors.
-                        A matrix of RGB values has 3 columns and the number of rows equals the length of x and y.
+                        To plot each marker with the same color, specify <varname>mcolors</varname>
+                        as a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can also be specified by a vector of 3 RGB values between 0 and 1.
+                        To plot each marker with a different color, specify <varname>mcolors</varname>
+                        as a vector with length equal to the length of <varname>x</varname>.
+                        The values of <varname>mcolors</varname> are linearly mapped to the colors
+                        in the current colormap.
+                        Colors can also by specified by a matrix of RGB values or a vector of
+                        strings representing known colors.
+                        A matrix of RGB values has 3 columns and the number of rows equals the
+                        length of <varname>x</varname>.
                         The default color is "blue".
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"fill"&gt;</term>
+                <term>"fill"</term>
                 <listitem>
                     <para>
-                        This string indicates that the markers are filled with colors.
-                        The markers background colors are set using the values of c.
-                        If c is not specified the fill color can be defined by the marker property "markerFaceColor" or "markerBackgroundColor".
-                        The default color is "blue".
+                        This string indicates that the markers are filled with some colors.
+                        By default, the filling colors are the same as the patterns ones.
+                        Both sets of colors can be defined independently by using the properties
+                        <varname>"markerFaceColor"</varname> or
+                        <varname>"markerBackgroundColor"</varname>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;marker&gt;</term>
+                <term>marker</term>
                 <listitem>
                     <para>
-                        Select the type of the marker.
-                        The figure below shows the 15 different marker types.
+                        Select the type of the marker. The same marker shape is used for all
+                        specified points. The figure below shows the 15 different marker types.
                     </para>
                     <para>
                         <inlinemediaobject>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;marker_property,value&gt;</term>
+                <term>&lt;marker_property, value&gt;</term>
                 <listitem>
                     <para>
-                        A sequence of property value pairs can be used to specify type, color and line width of the markers.
+                        A sequence of property value pairs can be used to specify type, color and
+                        line width of the markers.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"marker",value&gt; or &lt;"markerStyle",value&gt;</term>
+                <term>&lt;"marker", value&gt; or &lt;"markerStyle", value&gt;</term>
                 <listitem>
                     <para>
                         Specify the type of the marker, see the table above.
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"markerEdgeColor",value&gt; or &lt;"markerForeground",value&gt;</term>
+                <term>&lt;"markerEdgeColor", value&gt; or &lt;"markerForeground", value&gt;</term>
                 <listitem>
                     <para>
                         Specify the foreground color of the marker.
-                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can be specified by a string representing a known color,
+                        see <link linkend="color_list">color_list</link>.
                         A color can also be specified by a vector of 3 RGB values.
                         RGB values correspond to red, green and blue intensity between 0 and 1.
-                        This option is superseded by argument c.
+                        This option is superseded by argument <varname>mcolors</varname>.
                     </para>
                 </listitem>
             </varlistentry>
                 <listitem>
                     <para>
                         Specify the background color of the marker.
-                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can be specified by a string representing a known color
+                        see <link linkend="color_list">color_list</link>.
                         A color can also be specified by a vector of 3 RGB values.
                         RGB values correspond to red, green and blue intensity between 0 and 1.
-                        This option is superseded by argument c.
+                        This option is superseded by argument <varname>mcolors</varname>.
                     </para>
                 </listitem>
             </varlistentry>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;p&gt;</term>
+                <term>polyline</term>
                 <listitem>
                     <para>
-                        Returns a handle to the created polyline.
+                        Handle of the created polyline.
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>scatter(x,y)</literal> creates a scatter plot with markers at the locations specified by x and y.
-            The default type of the marker is a circle, the default color is "blue" and the default size is 36.
+            <literal>scatter(x,y)</literal> creates a scatter plot with markers centered at
+            the <literal>(x, y)</literal> set of coordinates.
+            The default type of the marker is a circle, the default color is "blue" and the default
+            size is 36.
             This means the circle surrounding the marker has an area of 36 points squared.
         </para>
         <para>
-            Using <literal>scatter(x,y,s,c)</literal> different sizes and colors for each marker can be specified.
+            Different sizes and colors for each marker can be specified with
+            <literal>scatter(x,y,msizes,mcolors)</literal>.
             There are many different ways to specify marker types, marker colors and marker sizes.
             For more details see the description of the arguments and the examples.
         </para>
-    </refsection>
-    <refsection>
-        <title>Remarks</title>
-        <para>
-            If you want to specify colors without specifying sizes use <literal>scatter(x,y,[],c)</literal>.
-        </para>
+        <note>
+          To skip an argument, just replace it with <literal>[]</literal> like in
+          <literal>scatter3(x,y,z,[],mcolors)</literal>.
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -325,7 +329,7 @@ y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
 // specify different sizes
 s = linspace(1,30,length(x))
 // create 2D scatter plot
-scatter(x,y,s)
+scatter(x, y, s)
  ]]></programlisting>
         <scilab:image>
             x = linspace(0,2,200)
@@ -338,12 +342,12 @@ scatter(x,y,s)
         </para>
         <programlisting role="example"><![CDATA[
 // x and y initialisation
-x = linspace(0,2,200)
+x = linspace(0, 2, 200)
 y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
 // specify different sizes
-s = linspace(1,30,length(x))
+s = linspace(1, 30, length(x))
 // set color map
-set(gcf(),"color_map",coolcolormap(64))
+gcf().color_map = coolcolormap(64);
 // colors according to x values
 c = x
 // create 2D scatter plot
@@ -353,7 +357,7 @@ scatter(x,y,s,c)
             x = linspace(0,2,200)
             y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
             s = linspace(1,30,length(x))
-            set(gcf(),"color_map",coolcolormap(64))
+            gcf().color_map = coolcolormap(64)
             c = x
             scatter(x,y,s,c)
         </scilab:image>
@@ -362,22 +366,22 @@ scatter(x,y,s,c)
         </para>
         <programlisting role="example"><![CDATA[
 // x and y initialisation
-x = linspace(0,2,200)
+x = linspace(0, 2, 200)
 y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
 // specify different sizes
-s = linspace(1,30,length(x))
+s = linspace(1, 30, length(x))
 // set color map
-set(gcf(),"color_map",coolcolormap(64))
+gcf().color_map = coolcolormap(64);
 // colors according to y values
 c = y
 // create 2D scatter plot
-scatter(x,y,s,c,"fill")
+scatter(x, y, s, c, "fill")
  ]]></programlisting>
         <scilab:image>
             x = linspace(0,2,200)
             y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
             s = linspace(1,30,length(x))
-            set(gcf(),"color_map",coolcolormap(64))
+            gcf().color_map = coolcolormap(64);
             c = y
             scatter(x,y,s,c,"fill")
         </scilab:image>
@@ -386,10 +390,10 @@ scatter(x,y,s,c,"fill")
         </para>
         <programlisting role="example"><![CDATA[
 // x and y initialisation
-x = rand(1,200)
-y = rand(1,200)
+x = rand(1, 200)
+y = rand(1, 200)
 // create 2D scatter plot
-scatter(x,y,"d")
+scatter(x, y, "d")
  ]]></programlisting>
         <scilab:image>
             x = rand(1,200)
@@ -401,12 +405,12 @@ scatter(x,y,"d")
         </para>
         <programlisting role="example"><![CDATA[
 // x and y initialisation
-x = rand(1,200)
-y = rand(1,200)
+x = rand(1, 200)
+y = rand(1, 200)
 // create 2D scatter plot
-scatter(x,y,"markerEdgeColor",[0 .4 .4],...
-            "markerFaceColor",[0 .8 .8],...
-            "linewidth",1.5)
+scatter(x, y, "markerEdgeColor",[0 .4 .4],...
+              "markerFaceColor",[0 .8 .8],...
+              "linewidth",1.5)
  ]]></programlisting>
         <scilab:image>
             x = rand(1,200)
@@ -420,14 +424,14 @@ scatter(x,y,"markerEdgeColor",[0 .4 .4],...
         </para>
         <programlisting role="example"><![CDATA[
 // x and y initialisation
-x = linspace(0,2,100)
+x = linspace(0, 2, 100)
 y = exp(-x).*cos(10*x) + 0.2*rand(1,length(x))
 // create 2D scatter subplot
-subplot(2,1,1)
-scatter(gca(),x,y)
+subplot(2, 1, 1)
+scatter(gca(), x, y)
 // create 2D scatter subplot
-subplot(2,1,2)
-scatter(gca(),x,y,"fill","s")
+subplot(2, 1, 2)
+scatter(gca(), x, y, "fill", "s")
  ]]></programlisting>
         <scilab:image>
             x = linspace(0,2,100)
@@ -443,10 +447,10 @@ scatter(gca(),x,y,"fill","s")
         <programlisting role="example"><![CDATA[
 // x and y initialisation
 t = linspace(0,1,200)
-x = t.*cos(10*%pi*t)
-y = t.*sin(10*%pi*t)
+x = t .* cos(10*%pi*t)
+y = t .* sin(10*%pi*t)
 // create 2D scatter plot
-p = scatter(x,y)
+p = scatter(x, y)
  ]]></programlisting>
         <scilab:image>
             t = linspace(0,25,200)
@@ -457,8 +461,8 @@ p = scatter(x,y)
         <programlisting role="example"><![CDATA[
 // modify polyline
 p.thickness = 0.5
-p.mark_foreground = addcolor(name2rgb("darkblue")/255)
-p.mark_background = addcolor(name2rgb("darkcyan")/255)
+p.mark_foreground = color("darkblue")
+p.mark_background = color("darkcyan")
  ]]></programlisting>
         <scilab:image>
             t = linspace(0,25,200)
@@ -466,8 +470,8 @@ p.mark_background = addcolor(name2rgb("darkcyan")/255)
             y = t.*sin(t)
             p = scatter(x,y,t)
             p.thickness = 0.5
-            p.mark_foreground = addcolor(name2rgb("darkblue")/255)
-            p.mark_background = addcolor(name2rgb("darkcyan")/255)
+            p.mark_foreground = color("darkblue")
+            p.mark_background = color("darkcyan")
         </scilab:image>
     </refsection>
     <refsection role="see also">
index 20f5c5c..4eee5f0 100644 (file)
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            p = scatter3(x,y,z,&lt;s&gt;,&lt;c&gt;,&lt;"fill"&gt;,&lt;marker&gt;,&lt;marker_property,value&gt;)
-            p = scatter3(&lt;axes_handle&gt;,...)
+            polyline = scatter3(x, y, z, msizes, mcolors, "fill", marker, &lt;marker_property,value&gt;)
+            polyline = scatter3(axes_handle,...)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>x</term>
+                <term>x, y, z</term>
                 <listitem>
                     <para>
-                        A column or row vector of n real numbers
-                        specifying the x positions of the markers center.
-                        x, y and z must be vectors of the same length.
+                        columns or rows vectors of n real numbers specifying the
+                        <varname>x</varname>, <varname>y</varname> and <varname>z</varname>
+                        coordinates of the centers of markers.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>y</term>
-                <listitem>
-                    <para>
-                        A column or row vector of n real numbers
-                        specifying the y positions of the markers center.
-                        x, y and z must be vectors of the same length.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>z</term>
-                <listitem>
-                    <para>
-                        A column or row vector of n real numbers
-                        specifying the y positions of the markers center.
-                        x, y and z must be vectors of the same length.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>&lt;s&gt;</term>
+                <term>msizes</term>
                 <listitem>
                     <para>
                         Specifying the sizes of the markers.
-                        To plot each marker with equal size, specify s as a scalar.
-                        To plot each marker with a different size, specify s as a vector with length equal to the length of x, y and z.
-                        The units for s is points squared with a default value of 36 points squared.
+                        To plot each marker with equal size, specify <varname>msizes</varname> as a scalar.
+                        To plot each marker with a different size, specify <varname>msizes</varname>
+                        as a vector with n components.
+                        The units for <varname>msizes</varname> is points squared, with a default
+                        value of 36 points squared.
                         The size equals the area of the circle surrounding the marker.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;c&gt;</term>
+                <term>mcolors</term>
                 <listitem>
                     <para>
                         Specifying the colors of the markers.
-                        To plot each marker with the same color, specify c as a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        To plot each marker with the same color, specify <varname>mcolors</varname>
+                        as a string representing a known color: see <link linkend="color_list">color_list</link>.
                         A color can also be specified by a vector of 3 RGB values.
                         RGB values correspond to red, green and blue intensity between 0 and 1.
-                        To plot each marker with a different color, specify c as a vector with length equal to the length of x, y and z.
-                        The values of c are linarly mapped to the colors in the current colormap.
-                        Colors can also by specified by a matrix of RGB values or a vector of strings representing known colors.
-                        A matrix of RGB values has 3 columns and the number of rows equals the length of x, y and z.
+                        To plot each marker with a different color, specify <varname>mcolors</varname>
+                        as a vector with n components.
+                        The values of <varname>mcolors</varname> are linearly mapped to the colors
+                        in the current colormap.
+                        Colors can also by specified by a matrix of RGB values or a vector of
+                        strings representing known colors.
+                        A matrix of RGB values has 3 columns and n rows.
                         The default color is "blue".
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"fill"&gt;</term>
+                <term>"fill"</term>
                 <listitem>
                     <para>
-                        This string indicates that the markers are filled with colors.
-                        The markers background colors are set using the values of c.
-                        If c is not specified the fill color can be defined by the marker property "markerFaceColor" or "markerBackgroundColor".
-                        The default color is "blue".
+                        This string indicates that the markers are filled with some colors.
+                        By default the filling colors of markers are the same as their shape ones.
+                        However, both colors can be set independently by using the properties
+                        <literal>"markerFaceColor"</literal> or <literal>"markerBackgroundColor"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;marker&gt;</term>
+                <term>marker</term>
                 <listitem>
                     <para>
-                        Select the type of the marker.
+                        Select the type of the marker. The same marker shape is used for all
+                        specified points.
                         The figure below shows the 15 different marker types.
                     </para>
                     <para>
                         </inlinemediaobject>
                     </para>
                     <para>
-                        Marker types are specified by strings, see the table below.
+                        Marker types are specified by strings: see the table below.
                     </para>
                     <para>
                         <informaltable border="1">
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;marker_property,value&gt;</term>
+                <term>&lt;marker_property, value&gt;</term>
                 <listitem>
                     <para>
-                        A sequence of property value pairs can be used to specify type, color and line width of the markers.
+                        A sequence of property value pairs can be used to specify type, color and
+                        line width of the markers.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"marker",value&gt; or &lt;"markerStyle",value&gt;</term>
+                <term>&lt;"marker", value&gt; or &lt;"markerStyle", value&gt;</term>
                 <listitem>
                     <para>
                         Specify the type of the marker, see the table above.
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"markerEdgeColor",value&gt; or &lt;"markerForeground",value&gt;</term>
+                <term>&lt;"markerEdgeColor", value&gt; or &lt;"markerForeground", value&gt;</term>
                 <listitem>
                     <para>
                         Specify the foreground color of the marker.
-                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can be specified by a string representing a known color:
+                        see <link linkend="color_list">color_list</link>.
                         A color can also be specified by a vector of 3 RGB values.
                         RGB values correspond to red, green and blue intensity between 0 and 1.
-                        This option is superseded by argument c.
+                        This option is superseded by the <varname>mcolors</varname> argument.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"markerFaceColor",value&gt; or &lt;"markerBackground",value&gt;</term>
+                <term>&lt;"markerFaceColor", value&gt; or &lt;"markerBackground", value&gt;</term>
                 <listitem>
                     <para>
                         Specify the background color of the marker.
-                        A color can be specified by a string representing a known color, see <link linkend="color_list">color_list</link>.
+                        A color can be specified by a string representing a known color:
+                        see <link linkend="color_list">color_list</link>.
                         A color can also be specified by a vector of 3 RGB values.
                         RGB values correspond to red, green and blue intensity between 0 and 1.
-                        This option is superseded by argument c.
+                        This option is superseded by argument <varname>mcolors</varname>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;"linewidth",value&gt; or &lt;"thickness",value&gt;</term>
+                <term>&lt;"linewidth", value&gt; or &lt;"thickness", value&gt;</term>
                 <listitem>
                     <para>
                         Specify the thickness of the edge of the marker.
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;axes_handle&gt;</term>
+                <term>axes_handle</term>
                 <listitem>
                     <para>This optional argument forces the scatter plot to appear inside the
                         selected axes given by <literal>axes_handle</literal> rather than inside the
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>&lt;p&gt;</term>
+                <term>polyline</term>
                 <listitem>
                     <para>
-                        Returns a handle to the created polyline.
+                        Handle of the created polyline.
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>scatter3(x,y)</literal> creates a scatter plot with markers at the locations specified by x and y.
-            The default type of the marker is a circle, the default color is "blue" and the default size is 36.
+            <literal>scatter3(x,y,z)</literal> creates a scatter plot with markers at the locations
+            specified by <varname>x</varname>, <varname>y</varname>, and <varname>z</varname>.
+            The default type of the marker is a circle, the default color is "blue" and the default
+            marker size is 36.
             This means the circle surrounding the marker has an area of 36 points squared.
         </para>
         <para>
-            Using <literal>scatter3(x,y,s,c)</literal> different sizes and colors for each marker can be specified.
+            Using <literal>scatter3(x,y,z,s,c)</literal> different sizes and colors for each marker
+            can be specified.
             There are many different ways to specify marker types, marker colors and marker sizes.
             For more details see the description of the arguments and the examples.
         </para>
-    </refsection>
-    <refsection>
-        <title>Remarks</title>
-        <para>
-            If you want to specify colors without specifying sizes use <literal>scatter3(x,y,[],c)</literal>.
-        </para>
+        <note>
+            <itemizedlist>
+              <listitem>
+                To skip an argument, just replace it with <literal>[]</literal> as in
+                <literal>scatter3(x,y,z,[],mcolors)</literal>.
+              </listitem>
+              <listitem>
+                 When the axes is rotated, the markers are automatically rotated as well in order
+                 to show always the same face to the observer.
+              </listitem>
+            </itemizedlist>
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
 t = 1:200
-x = t.*cos(t).*sin(t)
-y = t.*sin(t).*sin(t)
-z = t.*cos(t)
+x = t .* cos(t) .* sin(t)
+y = t .* sin(t) .* sin(t)
+z = t .* cos(t)
 // create 3D scatter plot
-scatter3(x,y,z)
+scatter3(x, y, z)
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60, 45];
  ]]></programlisting>
         <scilab:image>
             t = 1:200
@@ -330,7 +329,7 @@ set(gca(),"rotation_angles",[60,45])
             y = t.*sin(t).*sin(t)
             z = t.*cos(t)
             scatter3(x,y,z)
-            set(gca(),"rotation_angles",[60,45])
+            gca().rotation_angles = [60, 45];
         </scilab:image>
         <para>
             Vary marker size
@@ -338,24 +337,24 @@ set(gca(),"rotation_angles",[60,45])
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
 t = 1:200
-x = t.*cos(t).*sin(t)
-y = t.*sin(t).*sin(t)
-z = t.*cos(t)
+x = t .* cos(t) .* sin(t)
+y = t .* sin(t) .* sin(t)
+z = t .* cos(t)
 // size according to radius
-s = linspace(50,1,length(t))
+s = linspace(50, 1, length(t))
 // create 3D scatter plot
-scatter3(x,y,z,s)
+scatter3(x, y, z, s)
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60, 45];
  ]]></programlisting>
         <scilab:image>
             t = 1:200
-            x = t.*cos(t).*sin(t)
-            y = t.*sin(t).*sin(t)
-            z = t.*cos(t)
-            s = linspace(50,1,length(t))
-            scatter3(x,y,z,s)
-            set(gca(),"rotation_angles",[60,45])
+            x = t .* cos(t) .* sin(t)
+            y = t .* sin(t) .* sin(t)
+            z = t .* cos(t)
+            s = linspace(50, 1, length(t))
+            scatter3(x, y, z, s)
+            gca().rotation_angles = [60, 45];
         </scilab:image>
         <para>
             Vary marker size and color
@@ -363,19 +362,19 @@ set(gca(),"rotation_angles",[60,45])
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
 t = 1:200
-x = t.*cos(t).*sin(t)
-y = t.*sin(t).*sin(t)
-z = t.*cos(t)
+x = t .* cos(t) .* sin(t)
+y = t .* sin(t) .* sin(t)
+z = t .* cos(t)
 // size according to radius
-s = linspace(50,1,length(t))
+s = linspace(50, 1, length(t))
 // set color map
-set(gcf(),"color_map",coolcolormap(64))
+gcf().color_map = coolcolormap(64);
 // color according to radius
 c = t
 // create 3D scatter plot
-scatter3(x,y,z,s,c)
+scatter3(x, y, z, s, c)
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60, 45];
  ]]></programlisting>
         <scilab:image>
             t = 1:200
@@ -383,65 +382,65 @@ set(gca(),"rotation_angles",[60,45])
             y = t.*sin(t).*sin(t)
             z = t.*cos(t)
             s = linspace(50,1,length(t))
-            set(gcf(),"color_map",coolcolormap(64))
+            gcf().color_map = coolcolormap(64);
             c = t
             scatter3(x,y,z,s,c)
-            set(gca(),"rotation_angles",[60,45])
+            gca().rotation_angles = [60, 45];
         </scilab:image>
         <para>
             Fill the markers
         </para>
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
-z = linspace(0,25,200)
-x = z.*cos(z)
-y = z.*sin(z)
+z = linspace(0, 25, 200)
+x = z .* cos(z)
+y = z .* sin(z)
 // create 3D scatter plot
-scatter3(x,y,z,"fill")
+scatter3(x, y, z, "fill")
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60, 45];
  ]]></programlisting>
         <scilab:image>
             z = linspace(0,25,200)
             x = z.*cos(z)
             y = z.*sin(z)
             scatter3(x,y,z,"fill")
-            set(gca(),"rotation_angles",[60,45])
+            gca().rotation_angles = [60, 45];
         </scilab:image>
         <para>
             Specify marker symbol
         </para>
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
-z = linspace(0,25,200)
-x = z.*cos(z)
-y = z.*sin(z)
+z = linspace(0, 25, 200)
+x = z .* cos(z)
+y = z .* sin(z)
 // create 3D scatter plot
-scatter3(x,y,z,"*")
+scatter3(x, y, z, "*")
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60, 45];
  ]]></programlisting>
         <scilab:image>
             z = linspace(0,25,200)
             x = z.*cos(z)
             y = z.*sin(z)
             scatter3(x,y,z,"*")
-            set(gca(),"rotation_angles",[60,45])
+            gca().rotation_angles = [60,45];
         </scilab:image>
         <para>
             Change marker edge and face color
         </para>
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
-z = linspace(0,25,200)
-x = z.*cos(z)
-y = z.*sin(z)
+z = linspace(0, 25, 200)
+x = z .* cos(z)
+y = z .* sin(z)
 // create 3D scatter plot
-scatter3(x,y,z,...
-        "markerEdgeColor","black",...
-        "markerFaceColor",[0 .8 .8])
+scatter3(x, y, z,...
+        "markerEdgeColor", "black",...
+        "markerFaceColor", [0 .8 .8])
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60, 45];
  ]]></programlisting>
         <scilab:image>
             z = linspace(0,25,200)
@@ -450,7 +449,7 @@ set(gca(),"rotation_angles",[60,45])
             scatter3(x,y,z,...
             "markerEdgeColor","black",...
             "markerFaceColor",[0 .8 .8])
-            set(gca(),"rotation_angles",[60,45])
+            gca().rotation_angles = [60, 45];
         </scilab:image>
         <para>
             Specify subplot for scatter plot
@@ -458,29 +457,29 @@ set(gca(),"rotation_angles",[60,45])
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
 n = 20
-[x,y] = meshgrid(linspace(-2,2,n))
-z = exp(-x.^2-y.^2)
+[x, y] = meshgrid(linspace(-2, 2, n))
+z = exp(-x.^2 - y.^2)
 // create 3D scatter subplot
 subplot(2,1,1)
-scatter3(gca(),x(:),y(:),z(:))
+scatter3(gca(), x(:), y(:), z(:))
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60,45];
 // create 3D scatter subplot
 subplot(2,1,2)
-scatter3(gca(),x(:),y(:),z(:),"markerFaceColor",[0 .8 .8])
+scatter3(gca(), x(:), y(:), z(:), "markerFaceColor", [0 .8 .8])
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60,45];
  ]]></programlisting>
         <scilab:image>
             n = 20
             [x,y] = meshgrid(linspace(-2,2,n))
-            z = exp(-x.^2-y.^2)
+            z = exp(-x.^2 - y.^2)
             subplot(2,1,1)
-            scatter3(gca(),x(:),y(:),z(:))
-            set(gca(),"rotation_angles",[60,45])
+            scatter3(gca(), x(:), y(:), z(:))
+            gca().rotation_angles = [60, 45];
             subplot(2,1,2)
             scatter3(gca(),x(:),y(:),z(:),"markerFaceColor",[0 .8 .8])
-            set(gca(),"rotation_angles",[60,45])
+            gca().rotation_angles = [60, 45];
         </scilab:image>
         <para>
             Modify scatter plot after creation
@@ -488,15 +487,15 @@ set(gca(),"rotation_angles",[60,45])
         <programlisting role="example"><![CDATA[
 // x, y and z initialisation
 t = 1:200
-x = t.*cos(t).*sin(t)
-y = t.*sin(t).*sin(t)
-z = t.*cos(t)
+x = t .* cos(t) .* sin(t)
+y = t .* sin(t) .* sin(t)
+z = t .* cos(t)
 // size according to radius
-s = linspace(50,1,length(t))
+s = linspace(50, 1, length(t))
 // create 3D scatter plot
-scatter3(x,y,z,s)
+scatter3(x, y, z, s)
 // modify rotation angles
-set(gca(),"rotation_angles",[60,45])
+gca().rotation_angles = [60,45];
  ]]></programlisting>
         <scilab:image>
             t = 1:200
@@ -505,12 +504,12 @@ set(gca(),"rotation_angles",[60,45])
             z = t.*cos(t)
             s = linspace(50,1,length(t))
             p = scatter3(x,y,z,s)
-            set(gca(),"rotation_angles",[60,45])
+            gca().rotation_angles = [60,45];
         </scilab:image>
         <programlisting role="example"><![CDATA[
 // modify polyline
-p.mark_foreground = addcolor([0.5 0 0])
-p.mark_background = addcolor([0.5 0.5 0])
+p.mark_foreground = color(0.5, 0, 0)
+p.mark_background = color(0.5, 0.5, 0)
  ]]></programlisting>
         <scilab:image>
             t = 1:200
@@ -521,8 +520,8 @@ p.mark_background = addcolor([0.5 0.5 0])
             p = scatter3(x,y,z,s)
             set(gca(),"rotation_angles",[60,45])
             // modify polyline
-            p.mark_foreground = addcolor([0.5 0 0])
-            p.mark_background = addcolor([0.5 0.5 0])
+            p.mark_foreground = color(0.5, 0, 0)
+            p.mark_background = color(0.5, 0.5, 0)
         </scilab:image>
     </refsection>
     <refsection role="see also">
index a51db9a..1bf9d44 100644 (file)
@@ -16,7 +16,7 @@
 <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="subplot">
     <refnamediv>
         <refname>subplot</refname>
-        <refpurpose>divide a graphics window into a matrix of sub-windows</refpurpose>
+        <refpurpose>virtually grids the figure and sets the plotting area to a chosen cell</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
index eb9b906..f8b9954 100644 (file)
@@ -2,7 +2,7 @@
 <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="subplot">
     <refnamediv>
         <refname>subplot</refname>
-        <refpurpose>divise une fenêtre graphique en sous-fenêtres  </refpurpose>
+        <refpurpose>quadrille virtuellement la figure et fixe la zone de dessin dans une case choisie</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>