Swop the first and the second examples.

Now the second example changes the format of the floating point numbers
and it is more easier (for user) to understand what happens.

Change-Id: I580345a5c2b5a8079b5880a442cb283712361124

diff --git a/scilab/modules/graphics/help/en_US/2d_plot/contour2d.xml b/scilab/modules/graphics/help/en_US/2d_plot/contour2d.xml
index fc040da..71281d7 100644 (file)
--- a/scilab/modules/graphics/help/en_US/2d_plot/contour2d.xml
+++ b/scilab/modules/graphics/help/en_US/2d_plot/contour2d.xml
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
@@ -60,8 +60,8 @@
                                     equally spaced from <literal>zmin</literal>
                                     to <literal>zmax</literal> as follows:
                                 </para>
-                                <programlisting role="no-scilab-exec"><![CDATA[ 
-z= zmin + (1:nz)*(zmax-zmin)/(nz+1) 
+                                <programlisting role="no-scilab-exec"><![CDATA[
+z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
  ]]></programlisting>
                                 <para>
                                     <note>
@@ -71,7 +71,7 @@ z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
                                     but they can be added with
                                     </note>
                                 </para>
-                                <programlisting role="no-scilab-exec"><![CDATA[ 
+                                <programlisting role="no-scilab-exec"><![CDATA[
 [im,jm] = find(z == zmin); // or zmax
 plot2d(x(im)',y(jm)',-9,"000")
  ]]></programlisting>
@@ -95,7 +95,7 @@ plot2d(x(im)',y(jm)',-9,"000")
                 <term>&lt;opt_args&gt;</term>
                 <listitem>
                     <para>
-                        This represents a sequence of statements 
+                        This represents a sequence of statements
                         <literal>key1=value1, key2=value2</literal>,... where
                         <literal>key1</literal>, <literal>key2</literal>,... can
                         be one of the following: <literal>style</literal>,
@@ -157,18 +157,18 @@ plot2d(x(im)',y(jm)',-9,"000")
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11])
-// changing the format of the printing of the levels
-xset("fpf","%.2f")
  ]]></programlisting>
         <scilab:image>
             contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11]);
-            xset("fpf","%.2f")
         </scilab:image>
         <programlisting role="example"><![CDATA[
 clf()
+// changing the format of the printing of the levels
+xset("fpf","%.2f")
 contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11])
   ]]></programlisting>
         <scilab:image>
+            xset("fpf","%.2f")
             contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11])
         </scilab:image>
         <programlisting role="example"><![CDATA[
@@ -193,14 +193,14 @@ xtitle("Some level curves of the function cos(x)cos(y)")
         <scilab:image>
             x = linspace(0,4*%pi,80);
             z = cos(x')*cos(x);
-            
+
             clf(); f=gcf();
             xset("fpf"," ")
-            
+
             f.color_map=jetcolormap(7);
-            
+
             contour2d(x,x,z,-0.75:0.25:0.75,frameflag=3,rect=[0,0,5*%pi,4*%pi])
-            
+
             legends(string(-0.75:0.25:0.75),1:7,"lr");
             xtitle("Some level curves of the function cos(x)cos(y)")
         </scilab:image>

diff --git a/scilab/modules/graphics/help/ru_RU/2d_plot/contour2d.xml b/scilab/modules/graphics/help/ru_RU/2d_plot/contour2d.xml
index 80ca12f..ba88a28 100644 (file)
--- a/scilab/modules/graphics/help/ru_RU/2d_plot/contour2d.xml
+++ b/scilab/modules/graphics/help/ru_RU/2d_plot/contour2d.xml
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
@@ -64,8 +64,8 @@
                                     до <literal>zmax</literal>, как показано
                                     ниже:
                                 </para>
-                                <programlisting role="no-scilab-exec"><![CDATA[ 
-z= zmin + (1:nz)*(zmax-zmin)/(nz+1) 
+                                <programlisting role="no-scilab-exec"><![CDATA[
+z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
  ]]></programlisting>
                                 <para>
                                     <note>
@@ -75,7 +75,7 @@ z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
                                     добавить следующим образом:
                                     </note>
                                 </para>
-                                <programlisting role="no-scilab-exec"><![CDATA[ 
+                                <programlisting role="no-scilab-exec"><![CDATA[
 [im,jm] = find(z == zmin); // или zmax
 plot2d(x(im)',y(jm)',-9,"000")
  ]]></programlisting>
@@ -163,18 +163,18 @@ plot2d(x(im)',y(jm)',-9,"000")
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
 contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11])
-// Изменение формата печати уровней
-xset("fpf","%.2f")
  ]]></programlisting>
         <scilab:image>
             contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11]);
-            xset("fpf","%.2f")
         </scilab:image>
         <programlisting role="example"><![CDATA[
 clf()
+// Изменение формата печати уровней
+xset("fpf","%.2f")
 contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11])
   ]]></programlisting>
         <scilab:image>
+            xset("fpf","%.2f");
             contour2d(1:10,1:10,rand(10,10),5,rect=[0,0,11,11])
         </scilab:image>
         <programlisting role="example"><![CDATA[
@@ -189,7 +189,7 @@ xset("fpf"," ")
 //           не рисуются на кривых уровней
 f.color_map=jetcolormap(7);
 
-// уловка 2: чтобы иметь возможность поместить легенду справа без 
+// уловка 2: чтобы иметь возможность поместить легенду справа без
 //          наложения на кривые уровней, используйте rect с достаточно
 //          большим значением xmax
 contour2d(x,x,z,-0.75:0.25:0.75,frameflag=3,rect=[0,0,5*%pi,4*%pi])
@@ -203,14 +203,14 @@ xtitle("Некоторые уровни кривых функции cos(x)cos(y)
         <scilab:image>
             x = linspace(0,4*%pi,80);
             z = cos(x')*cos(x);
-            
+
             clf(); f=gcf();
             xset("fpf"," ")
-            
+
             f.color_map=jetcolormap(7);
-            
+
             contour2d(x,x,z,-0.75:0.25:0.75,frameflag=3,rect=[0,0,5*%pi,4*%pi])
-            
+
             legends(string(-0.75:0.25:0.75),1:7,"lr");
             xtitle("Некоторые уровни кривых функции cos(x)cos(y)")
         </scilab:image>