* fcontour2d tagged as obsolete. Will be removed for Scilab 5.5.0. 43/9943/8
Sylvestre Ledru [Fri, 21 Dec 2012 10:45:52 +0000 (11:45 +0100)]
Change-Id: I530926995055e23ad363993b5678a5080dfb7ef4

76 files changed:
scilab/CHANGES
scilab/modules/graphics/help/en_US/2d_plot/fcontour2d.xml [deleted file]
scilab/modules/graphics/help/en_US/Graphics.xml
scilab/modules/graphics/help/fr_FR/2d_plot/contour2di.xml
scilab/modules/graphics/help/fr_FR/2d_plot/contourf.xml
scilab/modules/graphics/help/fr_FR/Graphics.xml
scilab/modules/graphics/help/ja_JP/2d_plot/Sfgrayplot.xml
scilab/modules/graphics/help/ja_JP/2d_plot/fcontour2d.xml [deleted file]
scilab/modules/graphics/help/ja_JP/Graphics.xml
scilab/modules/graphics/help/pt_BR/2d_plot/Sfgrayplot.xml
scilab/modules/graphics/help/pt_BR/2d_plot/contour2di.xml
scilab/modules/graphics/help/pt_BR/2d_plot/contourf.xml
scilab/modules/graphics/help/pt_BR/2d_plot/fcontour2d.xml [deleted file]
scilab/modules/graphics/help/pt_BR/Graphics.xml
scilab/modules/graphics/help/ru_RU/Graphics.xml
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/fcontour2d.sci [deleted file]
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/Graphics_10.png
scilab/modules/helptools/images/Graphics_11.png
scilab/modules/helptools/images/Graphics_12.png
scilab/modules/helptools/images/Graphics_13.png
scilab/modules/helptools/images/Graphics_14.png
scilab/modules/helptools/images/Graphics_15.png
scilab/modules/helptools/images/Graphics_16.png
scilab/modules/helptools/images/Graphics_17.png
scilab/modules/helptools/images/Graphics_18.png
scilab/modules/helptools/images/Graphics_19.png
scilab/modules/helptools/images/Graphics_20.png
scilab/modules/helptools/images/Graphics_21.png
scilab/modules/helptools/images/Graphics_23.png
scilab/modules/helptools/images/Graphics_24.png
scilab/modules/helptools/images/Graphics_25.png
scilab/modules/helptools/images/Graphics_26.png
scilab/modules/helptools/images/Graphics_27.png
scilab/modules/helptools/images/Graphics_28.png
scilab/modules/helptools/images/Graphics_29.png
scilab/modules/helptools/images/Graphics_30.png
scilab/modules/helptools/images/Graphics_31.png
scilab/modules/helptools/images/Graphics_32.png
scilab/modules/helptools/images/Graphics_33.png
scilab/modules/helptools/images/Graphics_34.png
scilab/modules/helptools/images/Graphics_9.png
scilab/modules/helptools/images/Graphics_en_US_35.png [new file with mode: 0644]
scilab/modules/helptools/images/Graphics_en_US_36.png
scilab/modules/helptools/images/Graphics_en_US_37.png
scilab/modules/helptools/images/Graphics_en_US_38.png
scilab/modules/helptools/images/Graphics_en_US_39.png
scilab/modules/helptools/images/Graphics_en_US_40.png
scilab/modules/helptools/images/Graphics_en_US_41.png
scilab/modules/helptools/images/Graphics_fr_FR_35.png [new file with mode: 0644]
scilab/modules/helptools/images/Graphics_fr_FR_36.png
scilab/modules/helptools/images/Graphics_fr_FR_37.png
scilab/modules/helptools/images/Graphics_fr_FR_38.png
scilab/modules/helptools/images/Graphics_fr_FR_39.png
scilab/modules/helptools/images/Graphics_fr_FR_40.png
scilab/modules/helptools/images/Graphics_fr_FR_41.png
scilab/modules/helptools/images/Graphics_ja_JP_35.png [new file with mode: 0644]
scilab/modules/helptools/images/Graphics_ja_JP_36.png
scilab/modules/helptools/images/Graphics_ja_JP_37.png
scilab/modules/helptools/images/Graphics_ja_JP_38.png
scilab/modules/helptools/images/Graphics_ja_JP_39.png
scilab/modules/helptools/images/Graphics_ja_JP_40.png
scilab/modules/helptools/images/Graphics_ja_JP_41.png
scilab/modules/helptools/images/Graphics_ru_RU_35.png [new file with mode: 0644]
scilab/modules/helptools/images/Graphics_ru_RU_36.png
scilab/modules/helptools/images/Graphics_ru_RU_37.png
scilab/modules/helptools/images/Graphics_ru_RU_38.png
scilab/modules/helptools/images/Graphics_ru_RU_39.png
scilab/modules/helptools/images/Graphics_ru_RU_40.png
scilab/modules/helptools/images/Graphics_ru_RU_41.png
scilab/modules/helptools/images/Sfgrayplot_1.png
scilab/modules/helptools/images/Sfgrayplot_2.png
scilab/modules/helptools/images/Sfgrayplot_3.png
scilab/modules/helptools/images/Sfgrayplot_4.png [new file with mode: 0644]

index a8db4cb..e1d6755 100644 (file)
@@ -289,6 +289,8 @@ Removed Functions
 
 * xclear has been removed. Please use clf instead.
 
+* fcontour2d has been removed. Please use contour2d instead.
+
 * Symbolic module functions have been removed:
   - addf
   - cmb_lin
diff --git a/scilab/modules/graphics/help/en_US/2d_plot/fcontour2d.xml b/scilab/modules/graphics/help/en_US/2d_plot/fcontour2d.xml
deleted file mode 100644 (file)
index d0b9e5d..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" scilab:needs-examples="no" xml:id="fcontour2d">
-    <refnamediv>
-        <refname>fcontour2d</refname>
-        <refpurpose>
-            Level curves of a surface defined by a function on a 2D plot. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>fcontour2d(xr,yr,f,nz,[style,strf,leg,rect,nax])
-            fcontour2d(xr,yr,f,nz,&lt;opt_args&gt;)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>This function is obsolete. It is now included in the
-            <link linkend="contour2d">contour2d</link> function.
-        </para>
-    </refsection>
-</refentry>
index f0be51d..984a63b 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="fcontour2d">fcontour2d</link>
-                </term>
-                <listitem>
-                    <para>Level curves of a surface defined by a function on a 2D plot</para>
-                    <para>
-                        <emphasis role="bold">Example:</emphasis>
-                    </para>
-                    <para>
-                        <scilab:image>fcontour2d();</scilab:image>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>
                     <link linkend="grayplot">grayplot</link>
                 </term>
                 <listitem>
index 9cc329f..7d6d1d3 100644 (file)
@@ -8,7 +8,7 @@
         <title>Séquence d'appel</title>
         <synopsis>[xc,yc]=contour2di(x,y,z,nz)</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
                                     Si <literal>nz</literal> est un entier, sa valeur définit le nombre de courbes
                                     de niveaux espacées régulièrement entre zmin et zmax :
                                 </para>
-                                <programlisting role=""><![CDATA[ 
+                                <programlisting role=""><![CDATA[
 z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
  ]]></programlisting>
                                 <para>
                                     Noter que les niveaux <literal>zmin</literal> et <literal>zmax</literal> ne sont pas
                                     dessinés (génériquement ils sont réduits à des points) mais
                                     peuvent être ajoutés avec
-                                    
+
                                 </para>
-                                <programlisting role=""><![CDATA[ 
-[im,jm] = find(z == zmin);     // ou zmax 
+                                <programlisting role=""><![CDATA[
+[im,jm] = find(z == zmin);     // ou zmax
 plot2d(x(im)',y(jm)',-9,"000")
  ]]></programlisting>
                             </listitem>
@@ -72,7 +72,7 @@ plot2d(x(im)',y(jm)',-9,"000")
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>contour2di</literal> calcule les courbes de niveau (dans le plan) de la surface <literal>z=f(x,y)</literal>. Les valeurs de <literal>f(x,y)</literal> sont données par la matrice <literal>z</literal> aux points du plan définis par <literal>x</literal> et <literal>y</literal>.
@@ -85,9 +85,9 @@ plot2d(x(im)',y(jm)',-9,"000")
             La seconde courbe commence à <literal>xc(2+N1)</literal> et <literal>yc(2+N1)</literal> et ainsi de suite.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [xc,yc]=contour2di(1:10,1:10,rand(10,10),5);
 k=1;n=yc(k);c=1;
 while k+yc(k)<size(xc,'*')
@@ -108,9 +108,6 @@ end
                 <link linkend="fcontour">fcontour</link>
             </member>
             <member>
-                <link linkend="fcontour2d">fcontour2d</link>
-            </member>
-            <member>
                 <link linkend="contour2d">contour2d</link>
             </member>
             <member>
index 81cb832..8f88c7b 100644 (file)
@@ -8,7 +8,7 @@
         <title>Séquence d'appel</title>
         <synopsis>contourf(x,y,z,nz,[style,strf,leg,rect,nax])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
@@ -38,7 +38,7 @@
                                     définit le nombre de courbes de niveaux espacées régulièrement
                                     entre zmin et zmax :
                                 </para>
-                                <programlisting role=""><![CDATA[ 
+                                <programlisting role=""><![CDATA[
 z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
  ]]></programlisting>
                                 <para>
@@ -47,8 +47,8 @@ z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
                                     ils sont réduits à des points) mais peuvent être ajoutés
                                     avec
                                 </para>
-                                <programlisting role=""><![CDATA[ 
-[im,jm] = find(z == zmin);     // ou zmax 
+                                <programlisting role=""><![CDATA[
+[im,jm] = find(z == zmin);     // ou zmax
 plot2d(x(im)',y(jm)',-9,"000")
  ]]></programlisting>
                             </listitem>
@@ -84,7 +84,7 @@ plot2d(x(im)',y(jm)',-9,"000")
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>contourf</literal> remplit l'espace entre deux courbes de
@@ -104,21 +104,21 @@ plot2d(x(im)',y(jm)',-9,"000")
             la fonction.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 contourf(1:10,1:10,rand(10,10),5,1:5,"011"," ",[0,0,11,11])
  ]]></programlisting>
         <scilab:image>
             contourf(1:10,1:10,rand(10,10),5,1:5,"011"," ",[0,0,11,11])
         </scilab:image>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 function z=peaks(x,y)
 x1=x(:).*.ones(1,size(y,'*'));
 y1=y(:)'.*.ones(size(x,'*'),1);
-z =  (3*(1-x1).^2).*exp(-(x1.^2) - (y1+1).^2) ... 
-   - 10*(x1/5 - x1.^3 - y1.^5).*exp(-x1.^2-y1.^2) ... 
-   - 1/3*exp(-(x1+1).^2 - y1.^2) 
+z =  (3*(1-x1).^2).*exp(-(x1.^2) - (y1+1).^2) ...
+   - 10*(x1/5 - x1.^3 - y1.^5).*exp(-x1.^2-y1.^2) ...
+   - 1/3*exp(-(x1+1).^2 - y1.^2)
 endfunction
 
 function z=peakit()
@@ -147,17 +147,17 @@ contourf([],[],z,[-6:-1,-logspace(-5,0,10),logspace(-5,0,10),1:8]);
             function z=peaks(x,y)
             x1=x(:).*.ones(1,size(y,'*'));
             y1=y(:)'.*.ones(size(x,'*'),1);
-            z =  (3*(1-x1).^2).*exp(-(x1.^2) - (y1+1).^2) ... 
-            - 10*(x1/5 - x1.^3 - y1.^5).*exp(-x1.^2-y1.^2) ... 
-            - 1/3*exp(-(x1+1).^2 - y1.^2) 
+            z =  (3*(1-x1).^2).*exp(-(x1.^2) - (y1+1).^2) ...
+            - 10*(x1/5 - x1.^3 - y1.^5).*exp(-x1.^2-y1.^2) ...
+            - 1/3*exp(-(x1+1).^2 - y1.^2)
             endfunction
-            
+
             function z=peakit()
             x=-4:0.1:4;y=x;z=peaks(x,y);
             endfunction
-            
+
             z=peakit();
-            
+
             levels=[-6:-1,-logspace(-5,0,10),logspace(-5,0,10),1:8];
             m=size(levels,'*');
             n = fix(3/8*m);
@@ -181,9 +181,6 @@ contourf([],[],z,[-6:-1,-logspace(-5,0,10),logspace(-5,0,10),1:8]);
                 <link linkend="fcontour">fcontour</link>
             </member>
             <member>
-                <link linkend="fcontour2d">fcontour2d</link>
-            </member>
-            <member>
                 <link linkend="contour2di">contour2di</link>
             </member>
             <member>
index 21f9ca5..991ce62 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="fcontour2d">fcontour2d</link>
-                </term>
-                <listitem>
-                    <para>courbes de niveau d'une surface (définie par une fonction)</para>
-                    <para>
-                        <emphasis role="bold">Exemple:</emphasis>
-                    </para>
-                    <para>
-                        <scilab:image>fcontour2d();</scilab:image>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>
                     <link linkend="grayplot">grayplot</link>
                 </term>
                 <listitem>
index 624c51e..26424a5 100644 (file)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) ENPC - Jean-Philippe Chancelier
-
- * 
-
-
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * and continues to be available under such terms.
  * For more information, see the COPYING file which you should have received
  * along with this program.
-
  *
-
  -->
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="ja" xml:id="Sfgrayplot">
-    
     <refnamediv>
-        
         <refname>Sfgrayplot</refname>
-        
         <refpurpose>関数により定義された曲面の平滑化2次元カラープロット
-            
         </refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>
-            
             Sfgrayplot(x, y, f, &lt;opt_args&gt;)
-            
             Sfgrayplot(x, y, f [,strf, rect, nax, zminmax, colminmax, mesh, colout])
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="parameters">
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>x,y</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         大きさ <literal>n1</literal>および<literal>n2</literal>の実数行ベクトル.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>f</term>
-                
                 <listitem>
-                    
                     <para>
                         scilab 関数 (<literal>z=f(x,y)</literal>)
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>&lt;opt_args&gt;</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         一連の命令<literal>key1=value1,
-                            
                             key2=value2
-                            
                         </literal>
-                        
                         ,... を表します.
-                        
                         ただし, <literal>key1</literal>,
-                        
                         <literal>key2,...</literal> は以下のどれかとすることができます:
-                        
                         <varname>strf</varname>,
-                        
                         <varname>rect</varname>, <varname>nax</varname>,
-                        
                         <varname>zminmax</varname>, <varname>colminmax</varname>,
-                        
                         <varname>mesh</varname>, <varname>colout</varname>
-                        
                         (最初の3つについては <link linkend="plot2d">plot2d</link>,  最後の4つに
-                        
                         ついては<link linkend="fec">fec</link> を参照).
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>strf,rect,nax</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         <link linkend="plot2d">plot2d</link>参照.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>zminmax, colminmax, mesh, colout</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         <link linkend="fec">fec</link>参照.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>
-            
             <literal>Sfgrayplot</literal> は
-            
             <literal>fgrayplot</literal> と同じですが,プロットが平滑化されるところが
-            
-            異なります. 平滑化には関数 <literal>fec</literal> が使用されます. 
-            
-            面の描画の際には,以下のグリッド (ここでは <literal>n1=5</literal>, 
-            
+            異なります. 平滑化には関数 <literal>fec</literal> が使用されます.
+            面の描画の際には,以下のグリッド (ここでは <literal>n1=5</literal>,
             <literal>n2=3</literal>)から構築された
-            
             一連の三角形上では線形であると仮定されます:
-            
         </para>
-        
-        <screen><![CDATA[ 
-
+        <screen><![CDATA[
 _____________
-
 | /| /| /| /|
-
-|/_|/_|/_|/_| 
-
-| /| /| /| /| 
-
 |/_|/_|/_|/_|
-
+| /| /| /| /|
+|/_|/_|/_|/_|
  ]]></screen>
-        
         <para>
-            
             関数 <link linkend="colorbar">colorbar</link> は色スケールを参照する
-            
             際にも使用できます
-            
             (しかし,最小値と最大値が既知(または計算する)必要があります).
-            
         </para>
-        
         <para>
-            
             Sfgrayplotの代わりに, <link linkend="Sgrayplot">Sgrayplot</link> を
-            
             使用することができ,若干高速化される可能性があります.
-            
         </para>
-        
         <para>
-            
             デモを参照するにはコマンド <literal>Sfgrayplot()</literal> を入力してください.
-            
         </para>
-        
     </refsection>
-    
     <refsection>
-        
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <scilab:image>Sfgrayplot();</scilab:image>
+    </refsection>
+    <refsection role="examples">
+        <title>例</title>
+        <programlisting role="example"><![CDATA[
 // 例 #1: 4 個の面をプロット
-
 function z=surf1(x,y), z=x*y, endfunction
-
 function z=surf2(x,y), z=x^2-y^2, endfunction
-
 function z=surf3(x,y), z=x^3+y^2, endfunction
-
 function z=surf4(x,y), z=x^2+y^2, endfunction
-
 clf()
-
 set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
-
 x = linspace(-1,1,60);
-
 y = linspace(-1,1,60);
-
 drawlater() ;
-
 subplot(2,2,1)
-
   colorbar(-1,1,[1,64])
-
   Sfgrayplot(x,y,surf1,strf="041",colminmax=[1,64])
-
   xtitle("f(x,y) = x*y")
-
 subplot(2,2,2)
-
   colorbar(-1,1,[65,128])
-
   Sfgrayplot(x,y,surf2,strf="041",colminmax=[65,128])
-
   xtitle("f(x,y) = x^2-y^2")
-
 subplot(2,2,3)
-
   colorbar(-1,2,[65,128])
-
   Sfgrayplot(x,y,surf3,strf="041",colminmax=[65,128])
-
   xtitle("f(x,y) = x^3+y^2")
-
 subplot(2,2,4)
-
   colorbar(0,2,[1,64])
-
   Sfgrayplot(x,y,surf4,strf="041",colminmax=[1,64])
-
   xtitle("f(x,y) = x^2+y^2")
-
-drawnow() ;
-
+drawnow();
 show_window()
-
  ]]></programlisting>
-        
         <scilab:image>
-            
             function z=surf1(x,y), z=x*y, endfunction
-            
             function z=surf2(x,y), z=x^2-y^2, endfunction
-            
             function z=surf3(x,y), z=x^3+y^2, endfunction
-            
             function z=surf4(x,y), z=x^2+y^2, endfunction
-            
             clf()
-            
             set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
-            
             x = linspace(-1,1,60);
-            
             y = linspace(-1,1,60);
-            
             drawlater();
-            
             subplot(2,2,1)
-            
             colorbar(-1,1,[1,64])
-            
             Sfgrayplot(x,y,surf1,strf="041",colminmax=[1,64])
-            
             xtitle("f(x,y) = x*y")
-            
             subplot(2,2,2)
-            
             colorbar(-1,1,[65,128])
-            
             Sfgrayplot(x,y,surf2,strf="041",colminmax=[65,128])
-            
             xtitle("f(x,y) = x^2-y^2")
-            
             subplot(2,2,3)
-            
             colorbar(-1,2,[65,128])
-            
             Sfgrayplot(x,y,surf3,strf="041",colminmax=[65,128])
-            
             xtitle("f(x,y) = x^3+y^2")
-            
             subplot(2,2,4)
-            
             colorbar(0,2,[1,64])
-            
             Sfgrayplot(x,y,surf4,strf="041",colminmax=[1,64])
-            
             xtitle("f(x,y) = x^2+y^2")
-            
             drawnow();
-            
         </scilab:image>
-        
         <programlisting role="example"><![CDATA[
-
 // 例 #2: surf3 をプロットしいくつかの等高線を追加
-
 function z=surf3(x,y), z=x^3+y^2, endfunction
-
 clf()
-
 x = linspace(-1,1,60);
-
 y = linspace(-1,1,60);
-
 set(gcf(),"color_map",hotcolormap(128))
-
-drawlater() ;
-
+drawlater();
 colorbar(-1,2)
-
 Sfgrayplot(x,y,surf3,strf="041")
-
-fcontour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
-
+contour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
 xtitle("f(x,y) = x^3+y^2")
-
-drawnow() ;
-
+drawnow();
 show_window()
-
  ]]></programlisting>
-        
         <scilab:image>
-            
             function z=surf3(x,y), z=x^3+y^2, endfunction
-            
             clf()
-            
             x = linspace(-1,1,60);
-            
             y = linspace(-1,1,60);
-            
             set(gcf(),"color_map",hotcolormap(128))
-            
             drawlater();
-            
             colorbar(-1,2)
-            
             Sfgrayplot(x,y,surf3,strf="041")
-            
             contour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
-            
             xtitle("f(x,y) = x^3+y^2")
-            
-            drawnow() ;
-            
+            drawnow();
             show_window()
-            
         </scilab:image>
-        
         <programlisting role="example"><![CDATA[
-
 // 例 #3: surf3 をプロットし,プロットを -0.5<= z <= 1に制限するために
-
 // オプションの引数 zminmax および colout を使用
-
 function z=surf3(x,y), z=x^3+y^2, endfunction
-
 clf()
-
 x = linspace(-1,1,60);
-
 y = linspace(-1,1,60);
-
 set(gcf(),"color_map",jetcolormap(128))
-
-drawlater() ;
-
+drawlater();
 zminmax = [-0.5 1]; colors=[32 96];
-
 colorbar(zminmax(1),zminmax(2),colors)
-
 Sfgrayplot(x, y, surf3, strf="041", zminmax=zminmax, colout=[0 0], colminmax=colors)
-
-fcontour2d(x,y,surf3,[-0.5, 1],style=[1 1 1],strf="000")
-
+contour2d(x,y,surf3,[-0.5, 1],style=[1 1 1],strf="000")
 xtitle("f(x,y) = x^3+y^2, with parts under z = -0.5 and upper z = 1 removed")
-
-drawnow() ;
-
+drawnow();
 show_window()
-
  ]]></programlisting>
-        
         <scilab:image>
-            
             function z=surf3(x,y), z=x^3+y^2, endfunction
-            
             clf()
-            
             x = linspace(-1,1,60);
-            
             y = linspace(-1,1,60);
-            
             set(gcf(),"color_map",jetcolormap(128))
-            
-            drawlater() ;
-            
+            drawlater();
             zminmax = [-0.5 1]; colors=[32 96];
-            
             colorbar(zminmax(1),zminmax(2),colors)
-            
             Sfgrayplot(x, y, surf3, strf="041", zminmax=zminmax, colout=[0 0], colminmax=colors)
-            
             contour2d(x,y,surf3,[-0.5, 1],style=[1 1 1],strf="000")
-            
             xtitle("f(x,y) = x^3+y^2, with parts under z = -0.5 and upper z = 1 removed")
-            
-            drawnow() ;
-            
+            drawnow();
             show_window()
-            
         </scilab:image>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="fec">fec</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="fgrayplot">fgrayplot</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="grayplot">grayplot</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="Sgrayplot">Sgrayplot</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
 </refentry>
-
diff --git a/scilab/modules/graphics/help/ja_JP/2d_plot/fcontour2d.xml b/scilab/modules/graphics/help/ja_JP/2d_plot/fcontour2d.xml
deleted file mode 100644 (file)
index 5f4f82b..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) ENPC - Jean-Philippe Chancelier
-
- * 
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
- *
-
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="fcontour2d">
-    
-    <refnamediv>
-        
-        <refname>fcontour2d</refname>
-        
-        <refpurpose>
-            
-            2次元プロット上に関数で定義された曲面の等高線を描画.
-            
-            <emphasis role="bold">この関数は廃止されました.</emphasis>
-            
-        </refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>fcontour2d(xr,yr,f,nz,[style,strf,leg,rect,nax])
-            
-            fcontour2d(xr,yr,f,nz,&lt;opt_args&gt;)
-            
-        </synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>この関数は廃止されており,
-            
-            <link linkend="contour2d">contour2d</link> 関数に統合されています.
-            
-        </para>
-        
-    </refsection>
-    
-</refentry>
-
index 134d2c4..35d11da 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="fcontour2d">fcontour2d</link>
-                </term>
-                <listitem>
-                    <para>2次元プロット上に関数で定義された曲面の等高線をプロット</para>
-                    <para>
-                        <emphasis role="bold">例:</emphasis>
-                    </para>
-                    <para>
-                        <scilab:image>fcontour2d();</scilab:image>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>
                     <link linkend="grayplot">grayplot</link>
                 </term>
                 <listitem>
index 8b832e5..6bf376e 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="Sfgrayplot" xml:lang="en">
     <refnamediv>
         <refname>Sfgrayplot</refname>
-        <refpurpose>esboço 2d suave de uma superfície definida por uma função
-            utilizando cores 
+        <refpurpose>esboço 2d suave de uma superfície definida por uma função
+            utilizando cores
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>Sfgrayplot(x,y,f,&lt;opt_args&gt;)
             Sfgrayplot(x,y,f [,strf, rect, nax, zminmax, colminmax, mesh, colout])
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>x,y</term>
             <varlistentry>
                 <term>f</term>
                 <listitem>
-                    <para>função do Scilab (z=f(x,y)) </para>
+                    <para>função do Scilab (z=f(x,y)) </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>&lt;opt_args&gt;</term>
                 <listitem>
                     <para>
-                        representa uma seqüência de declarações <literal>key1=value1,
+                        representa uma seqüência de declarações <literal>key1=value1,
                             key2=value2
                         </literal>
                         ,... onde <literal>key1</literal>,
                         <literal>key2,...</literal> podem ser um dos seguintes: strf, rect,
-                        nax, zminmax, colminmax, mesh, colout (ver <link linkend="plot2d">plot2d</link> para os três primeiros e <link linkend="fec">fec</link> para os quatro últimos).
+                        nax, zminmax, colminmax, mesh, colout (ver <link linkend="plot2d">plot2d</link> para os três primeiros e <link linkend="fec">fec</link> para os quatro últimos).
                     </para>
                 </listitem>
             </varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
-            <literal>Sfgrayplot</literal> é o mesmo que
-            <literal>fgrayplot</literal> mas o esboço é suavizado. A função
-            <literal>fec</literal> é utilizada para suavização. A superfície é
-            esboçada assumindo-se que é linear em um conjunto de triângulos
-            construídos a partir do grid (aqui, com n1=5, n2=3):
+            <literal>Sfgrayplot</literal> é o mesmo que
+            <literal>fgrayplot</literal> mas o esboço é suavizado. A função
+            <literal>fec</literal> é utilizada para suavização. A superfície é
+            esboçada assumindo-se que é linear em um conjunto de triângulos
+            construídos a partir do grid (aqui, com n1=5, n2=3):
         </para>
-        <screen><![CDATA[ 
+        <screen><![CDATA[
 _____________
 | /| /| /| /|
-|/_|/_|/_|/_| 
-| /| /| /| /| 
+|/_|/_|/_|/_|
+| /| /| /| /|
 |/_|/_|/_|/_|
  ]]></screen>
         <para>
-            A função <link linkend="colorbar">colorbar</link> pode ser utilizada
-            para se visualizar a escala de cores (mas você deve saber (ou computar) os
-            valores mínimo e máximo).
+            A função <link linkend="colorbar">colorbar</link> pode ser utilizada
+            para se visualizar a escala de cores (mas você deve saber (ou computar) os
+            valores mínimo e máximo).
         </para>
         <para>
-            Ao invés de Sfgrayplot, você pode usar <link linkend="Sgrayplot">Sgrayplot</link> este pode ser um pouco mais
-            rápido.
+            Ao invés de Sfgrayplot, você pode usar <link linkend="Sgrayplot">Sgrayplot</link> este pode ser um pouco mais
+            rápido.
         </para>
         <para>
             Entre com o comando <literal>Sfgrayplot()</literal> para visualizar
-            uma demonstração.
+            uma demonstração.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-// exemplo #1: esboço de 4 superfícies
+        <programlisting role="example"><![CDATA[
+// exemplo #1: esboço de 4 superfícies
 function z=surf1(x,y), z=x*y, endfunction
 function z=surf2(x,y), z=x^2-y^2, endfunction
 function z=surf3(x,y), z=x^3+y^2, endfunction
@@ -172,7 +172,7 @@ set(gcf(),"color_map",hotcolormap(128))
 drawlater();
 colorbar(-1,2)
 Sfgrayplot(x,y,surf3,strf="041")
-fcontour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
+contour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
 xtitle("f(x,y) = x^3+y^2")
 drawnow();
 show_window()
@@ -203,7 +203,7 @@ drawlater();
 zminmax = [-0.5 1]; colors=[32 96];
 colorbar(zminmax(1),zminmax(2),colors)
 Sfgrayplot(x, y, surf3, strf="041", zminmax=zminmax, colout=[0 0], colminmax=colors)
-fcontour2d(x,y,surf3,[-0.5, 1],style=[1 1 1],strf="000")
+contour2d(x,y,surf3,[-0.5, 1],style=[1 1 1],strf="000")
 xtitle("f(x,y) = x^3+y^2, com partes abaixo de z = -0.5 e acima de z = 1 removidas")
 drawnow() ;
 show_window()
@@ -225,7 +225,7 @@ show_window()
         </scilab:image>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="fec">fec</link>
index 0617c8a..64c6903 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
 <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="contour2di" xml:lang="en">
     <refnamediv>
         <refname>contour2di</refname>
-        <refpurpose>Computa curvas de nível em um esboço 2d</refpurpose>
+        <refpurpose>Computa curvas de nível em um esboço 2d</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[xc,yc]=contour2di(x,y,z,nz)</synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>x,y</term>
             <varlistentry>
                 <term>z</term>
                 <listitem>
-                    <para>matriz de reais de tamanho (n1,n2), os valores da função.
+                    <para>matriz de reais de tamanho (n1,n2), os valores da função.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>nz</term>
                 <listitem>
-                    <para>os valores de nível ou o número de níveis.</para>
+                    <para>os valores de nível ou o número de níveis.</para>
                     <variablelist>
                         <varlistentry>
                             <term/>
                             <listitem>
                                 <para>
                                     Se <literal>nz</literal> for um inteiro, seu valor
-                                    fornece o número de níveis igualmente espaçados de zmin a zmax
+                                    fornece o número de níveis igualmente espaçados de zmin a zmax
                                     como segue:
                                 </para>
-                                <programlisting role=""><![CDATA[ 
+                                <programlisting role=""><![CDATA[
 z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
  ]]></programlisting>
                                 <para>
-                                    Note que os níveis <literal>zmin</literal> e
-                                    <literal>zmax</literal> não são desenhados (genericamente eles
-                                    são reduzidos a pontos) mas podem ser adicionados através de
+                                    Note que os níveis <literal>zmin</literal> e
+                                    <literal>zmax</literal> não são desenhados (genericamente eles
+                                    são reduzidos a pontos) mas podem ser adicionados através de
                                 </para>
-                                <programlisting role=""><![CDATA[ 
-[im,jm] = find(z == zmin);     // ou zmax 
+                                <programlisting role=""><![CDATA[
+[im,jm] = find(z == zmin);     // ou zmax
 plot2d(x(im)',y(jm)',-9,"000")
  ]]></programlisting>
                             </listitem>
@@ -71,8 +71,8 @@ plot2d(x(im)',y(jm)',-9,"000")
                             <listitem>
                                 <para>
                                     Se <literal>nz</literal> for um vetor,
-                                    <literal>nz(i)</literal> fornece o valor da i-ésima curva de
-                                    nível. 
+                                    <literal>nz(i)</literal> fornece o valor da i-ésima curva de
+                                    nível.
                                 </para>
                             </listitem>
                         </varlistentry>
@@ -82,35 +82,35 @@ plot2d(x(im)',y(jm)',-9,"000")
             <varlistentry>
                 <term>xc,yc</term>
                 <listitem>
-                    <para>vetores de tamanhos idênticos contendo as definições dos
+                    <para>vetores de tamanhos idênticos contendo as definições dos
                         contornos. Ver detalhes abaixo.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
-            <literal>contour2di</literal> computa as curvas de nível de uma
-            superfície <literal>z=f(x,y)</literal> em um esboço 2d. Os valores de
-            <literal>f(x,y)</literal> asão dados pela matriz <literal>z</literal> nos
+            <literal>contour2di</literal> computa as curvas de nível de uma
+            superfície <literal>z=f(x,y)</literal> em um esboço 2d. Os valores de
+            <literal>f(x,y)</literal> asão dados pela matriz <literal>z</literal> nos
             pontos de grid definidos por <literal>x</literal> e
             <literal>y</literal>.
         </para>
         <para>
-            <literal>xc(1)</literal> contém o nível associado ao primeiro
-            caminho de contorno, <literal>yc(1)</literal> contém o número
+            <literal>xc(1)</literal> contém o nível associado ao primeiro
+            caminho de contorno, <literal>yc(1)</literal> contém o número
             <literal>N1</literal> de pontos definindo este caminho de contorno e
-            (<literal>xc(1+(1:N1))</literal>, <literal>yc(1+(1:N1))</literal> ) contém
-            as coordenadas dos pontos do caminho. O segundo caminho começa em
+            (<literal>xc(1+(1:N1))</literal>, <literal>yc(1+(1:N1))</literal> ) contém
+            as coordenadas dos pontos do caminho. O segundo caminho começa em
             <literal>xc(2+N1)</literal> e <literal>yc(2+N1)</literal> e assim por
             diante.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 [xc,yc]=contour2di(1:10,1:10,rand(10,10),5);
 k=1;n=yc(k);c=1;
 while k+yc(k)<size(xc,'*')
@@ -121,8 +121,8 @@ while k+yc(k)<size(xc,'*')
 end
  ]]></programlisting>
     </refsection>
-    <refsection>
-        <title>Ver Também </title>
+    <refsection role="see also">
+        <title>Ver Também </title>
         <simplelist type="inline">
             <member>
                 <link linkend="contour">contour</link>
@@ -131,9 +131,6 @@ end
                 <link linkend="fcontour">fcontour</link>
             </member>
             <member>
-                <link linkend="fcontour2d">fcontour2d</link>
-            </member>
-            <member>
                 <link linkend="contour2d">contour2d</link>
             </member>
             <member>
index 1ff5ceb..b78d869 100644 (file)
@@ -24,7 +24,7 @@
         <title>Seqüência de Chamamento</title>
         <synopsis>contourf(x,y,z,nz,[style,strf,leg,rect,nax])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Parâmetrtos</title>
         <variablelist>
             <varlistentry>
@@ -54,7 +54,7 @@
                                     fornece o número de níveis igualmente espaçados de zmin a zmax
                                     como segue:
                                 </para>
-                                <programlisting role=""><![CDATA[ 
+                                <programlisting role=""><![CDATA[
 z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
  ]]></programlisting>
                                 <para>
@@ -62,8 +62,8 @@ z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
                                     <literal>zmax</literal> não são desenhados (genericamente eles
                                     são reduzidos a pontos) mas podem ser adicionados através de
                                 </para>
-                                <programlisting role=""><![CDATA[ 
-[im,jm] = find(z == zmin);     // ou zmax 
+                                <programlisting role=""><![CDATA[
+[im,jm] = find(z == zmin);     // ou zmax
 plot2d(x(im)',y(jm)',-9,"000")
  ]]></programlisting>
                             </listitem>
@@ -94,7 +94,7 @@ plot2d(x(im)',y(jm)',-9,"000")
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Descrição</title>
         <para>
             <literal>contourf</literal> pinta a superfície entre duas curvas de
@@ -114,17 +114,17 @@ plot2d(x(im)',y(jm)',-9,"000")
             uma demonstração.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 contourf(1:10,1:10,rand(10,10),5,1:5,"011"," ",[0,0,11,11])
 
 function z=peaks(x,y)
 x1=x(:).*.ones(1,size(y,'*'));
 y1=y(:)'.*.ones(size(x,'*'),1);
-z =  (3*(1-x1).^2).*exp(-(x1.^2) - (y1+1).^2) ... 
-   - 10*(x1/5 - x1.^3 - y1.^5).*exp(-x1.^2-y1.^2) ... 
-   - 1/3*exp(-(x1+1).^2 - y1.^2) 
+z =  (3*(1-x1).^2).*exp(-(x1.^2) - (y1+1).^2) ...
+   - 10*(x1/5 - x1.^3 - y1.^5).*exp(-x1.^2-y1.^2) ...
+   - 1/3*exp(-(x1+1).^2 - y1.^2)
 endfunction
 
 function z=peakit()
@@ -150,7 +150,7 @@ clf();
 contourf([],[],z,[-6:-1,-logspace(-5,0,10),logspace(-5,0,10),1:8]);
  ]]></programlisting>
     </refsection>
-    <refsection>
+    <refsection role="see also">
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
@@ -160,9 +160,6 @@ contourf([],[],z,[-6:-1,-logspace(-5,0,10),logspace(-5,0,10),1:8]);
                 <link linkend="fcontour">fcontour</link>
             </member>
             <member>
-                <link linkend="fcontour2d">fcontour2d</link>
-            </member>
-            <member>
                 <link linkend="contour2di">contour2di</link>
             </member>
             <member>
diff --git a/scilab/modules/graphics/help/pt_BR/2d_plot/fcontour2d.xml b/scilab/modules/graphics/help/pt_BR/2d_plot/fcontour2d.xml
deleted file mode 100644 (file)
index ba03b02..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
- * 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="fcontour2d" xml:lang="en">
-    <refnamediv>
-        <refname>fcontour2d</refname>
-        <refpurpose>curvas de nível de uma superfície definida por uma função em
-            um esboço 2d
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>fcontour2d(xr,yr,f,nz,[style,strf,leg,rect,nax])
-            fcontour2d(xr,yr,f,nz,&lt;opt_args&gt;)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Esta função está obsoleta. Está agora inclusa na função <link linkend="contour2d">contour2d</link>.
-        </para>
-    </refsection>
-</refentry>
index 2bc219e..c490f4a 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>fcontour2d</term>
-                <listitem>
-                    <para>curvas de nível de uma superfície definida por uma função em
-                        um esboço 2d
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>grayplot</term>
                 <listitem>
                     <para>esboço 2d de uma superfície utilizando-se cores</para>
                     </para>
                 </listitem>
             </varlistentry>
+<<<<<<< HEAD
+=======
+            <varlistentry>
+                <term>getsymbol</term>
+                <listitem>
+                    <para>Diálogo para a seleção de um símbolo e seu tamanho.</para>
+                </listitem>
+            </varlistentry>
+>>>>>>> 9126f3f... * fcontour2d tagged as obsolete. Will be removed for Scilab 5.5.0.
         </variablelist>
     </refsection>
     <refsection>
index 12df18d..0681acd 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="fcontour2d">fcontour2d</link>
-                </term>
-                <listitem>
-                    <para>
-                        Кривые уровней поверхности, определённой функцией, на
-                        двумерном графике.
-                    </para>
-                    <para>
-                        <emphasis role="bold">Пример:</emphasis>
-                    </para>
-                    <para>
-                        <scilab:image>fcontour2d();</scilab:image>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>
                     <link linkend="grayplot">grayplot</link>
                 </term>
                 <listitem>
index 8f21107..dc8fce2 100644 (file)
@@ -3431,7 +3431,6 @@ msgstr ""
 # File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 20
 # File: modules/graphics/macros/errbar.sci, line: 36
 # File: modules/graphics/macros/fcontour.sci, line: 52
-# File: modules/graphics/macros/fcontour2d.sci, line: 27
 # File: modules/graphics/macros/fgrayplot.sci, line: 38
 # File: modules/graphics/macros/fplot2d.sci, line: 30
 # File: modules/graphics/macros/fplot3d.sci, line: 33
diff --git a/scilab/modules/graphics/macros/fcontour2d.sci b/scilab/modules/graphics/macros/fcontour2d.sci
deleted file mode 100644 (file)
index 7c58876..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function fcontour2d(xr,yr,f,nz,style,strf,leg,rect,nax,void)
-
-    // deff('[z]=Surf(x,y)','z=x**2+y**2');
-    // fcontour(Surf,-1:0.1:1,-1:0.1:1,10);
-
-
-    [lhs,rhs]=argn(0);
-
-    if rhs == 0 then   // demo
-        deff("[z]=Surf(x,y)","z=x**3+y");
-        fcontour2d(-1:0.1:1,-1:0.1:1,Surf,10,style=1:10,rect=[-1,-1,1,1]*1.5,strf="011");
-        return
-    end
-
-    if rhs<3,
-        error(msprintf(gettext("%s: Wrong number of input argument(s): At least %d expected.\n"), "fcontour2d", 3));
-    end
-
-    opts=[]
-    if exists("nz","local")==0 then nz=10,rhs=rhs+1,end
-    if exists("style","local")==1 then opts=[opts,"style=style"],end
-    if exists("strf","local")==1 then opts=[opts,"strf=strf"],end
-    if exists("leg","local")==1 then opts=[opts,"leg=leg"],end
-    if exists("rect","local")==1 then opts=[opts,"rect=rect"],end
-    if exists("nax","local")==1 then opts=[opts,"nax=nax"],end
-    if exists("frameflag","local")==1 then opts=[opts,"frameflag=frameflag"],end
-    if exists("axesflag","local")==1 then opts=[opts,"axesflag=axesflag"],end
-
-    if type(f)==11 then comp(f),end;
-    execstr("contour2d(xr,yr,feval(xr,yr,f),nz,"+strcat(opts,",")+")")
-endfunction
index 4eb6fe2..15ecaf2 100644 (file)
@@ -49,67 +49,71 @@ EXPRESSION_1.png=f63c889d3d4602b03a883497318fda61
 GENSIN_f_1.png=e4e9107e33977bc2ec15c56eda72b817
 GENSQR_f_1.png=5d1882efbb97cbba3134b38ece4a3669
 Graphics_1.png=27c8486b418fbb7c6824eed71d033448
-Graphics_10.png=a5dddbe55ffd41e86ea4664a5d58cb4a
-Graphics_11.png=85bdf268d4455ec7852e0b60d76126b2
-Graphics_12.png=cf9d9d7863400326039f6da3b814cec7
-Graphics_13.png=f3fb91c58fe1342f76461c2bd4f43af3
-Graphics_14.png=2a3b1dcd31d5cb054964f147c6676168
-Graphics_15.png=83ad54aee8bee439a11c19199df4d57
-Graphics_16.png=22e946ae43362626173962583ba2c75
-Graphics_17.png=6735304861cac3a527410d9fca7acdbf
-Graphics_18.png=4db104cec73db5309f073b24c2d740e1
-Graphics_19.png=48a5ce7ae83e9764fa8285fb1b25b4f9
+Graphics_10.png=85bdf268d4455ec7852e0b60d76126b2
+Graphics_11.png=cf9d9d7863400326039f6da3b814cec7
+Graphics_12.png=f3fb91c58fe1342f76461c2bd4f43af3
+Graphics_13.png=2a3b1dcd31d5cb054964f147c6676168
+Graphics_14.png=83ad54aee8bee439a11c19199df4d57
+Graphics_15.png=22e946ae43362626173962583ba2c75
+Graphics_16.png=6735304861cac3a527410d9fca7acdbf
+Graphics_17.png=4db104cec73db5309f073b24c2d740e1
+Graphics_18.png=48a5ce7ae83e9764fa8285fb1b25b4f9
+Graphics_19.png=f2eddb04d3bcde0e1b98decc8a32c3d1
 Graphics_2.png=ca7d6e343da4cb84c5550b19b5111a5e
-Graphics_20.png=f2eddb04d3bcde0e1b98decc8a32c3d1
-Graphics_21.png=fb426fe907194095989682f8c1c4b477
-Graphics_22.png=3039a9134c31453b49ff23776a4e6abf
-Graphics_23.png=e95387c52bc0f1f2bfc674b62c9bb537
-Graphics_24.png=1769acb58167f96070f6c71dcd54cbf2
-Graphics_25.png=9aa99fe47c0336f58aa119f292cea0c0
-Graphics_26.png=9031d249fda1aeea0a14f05417e56bd7
-Graphics_27.png=90067203ae72d8ba7f61061a17f7d016
-Graphics_28.png=2e80dc6ec334a5caf5b2c918e68bad3
-Graphics_29.png=4bc6636c30fd29609f4bd77bfeaea661
+Graphics_20.png=fb426fe907194095989682f8c1c4b477
+Graphics_21.png=3039a9134c31453b49ff23776a4e6abf
+Graphics_22.png=e95387c52bc0f1f2bfc674b62c9bb537
+Graphics_23.png=1769acb58167f96070f6c71dcd54cbf2
+Graphics_24.png=9aa99fe47c0336f58aa119f292cea0c0
+Graphics_25.png=9031d249fda1aeea0a14f05417e56bd7
+Graphics_26.png=90067203ae72d8ba7f61061a17f7d016
+Graphics_27.png=2e80dc6ec334a5caf5b2c918e68bad3
+Graphics_28.png=4bc6636c30fd29609f4bd77bfeaea661
+Graphics_29.png=f81c4cf83b99442956c35722e86ec478
 Graphics_3.png=9d4c072a9f27f8f0e07f7d098ee533ec
-Graphics_30.png=f81c4cf83b99442956c35722e86ec478
-Graphics_31.png=7fe04f65bcbeb65eef5f90b3759be02e
-Graphics_32.png=87ec396c51a7cc6aafb148e1aa5f9256
-Graphics_33.png=67f6ae9c0d36df93eb50e514746aac13
-Graphics_34.png=26826b399f567100ed0118a54c896b5a
+Graphics_30.png=7fe04f65bcbeb65eef5f90b3759be02e
+Graphics_31.png=87ec396c51a7cc6aafb148e1aa5f9256
+Graphics_32.png=67f6ae9c0d36df93eb50e514746aac13
+Graphics_33.png=26826b399f567100ed0118a54c896b5a
+Graphics_34.png=d23142ccde9162c1dd911048a34bad42
 Graphics_35.png=d23142ccde9162c1dd911048a34bad42
 Graphics_4.png=ca17ee46fae89a343407d090111051b5
 Graphics_5.png=6e915789427344f2111be90b463014b3
 Graphics_6.png=e830cf073e36fb2c95cf85a9eee02c52
 Graphics_7.png=bbb197885458782741ad914e27c8ecf7
 Graphics_8.png=82170d2a412a217cfb313017bbec8f7f
-Graphics_9.png=20ae9f341a6e880b7da760c8eecd2705
-Graphics_en_US_36.png=caffc3a1e808e6c77f4b3507ccf2244d
-Graphics_en_US_37.png=2297699ec06e47b2fe0a18a86fd34c29
-Graphics_en_US_38.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
-Graphics_en_US_39.png=415eb9aa50045f403f03bf90418a60da
-Graphics_en_US_40.png=76950c3a78d543018ca046b7e5709d88
-Graphics_en_US_41.png=949d08ca0d73f015692fe34327e6f479
+Graphics_9.png=a5dddbe55ffd41e86ea4664a5d58cb4a
+Graphics_en_US_35.png=caffc3a1e808e6c77f4b3507ccf2244d
+Graphics_en_US_36.png=2297699ec06e47b2fe0a18a86fd34c29
+Graphics_en_US_37.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
+Graphics_en_US_38.png=415eb9aa50045f403f03bf90418a60da
+Graphics_en_US_39.png=76950c3a78d543018ca046b7e5709d88
+Graphics_en_US_40.png=949d08ca0d73f015692fe34327e6f479
+Graphics_en_US_41.png=472c77f8a7f56a9ecded78b1cb041139
 Graphics_en_US_42.png=472c77f8a7f56a9ecded78b1cb041139
-Graphics_fr_FR_36.png=caffc3a1e808e6c77f4b3507ccf2244d
-Graphics_fr_FR_37.png=2297699ec06e47b2fe0a18a86fd34c29
-Graphics_fr_FR_38.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
-Graphics_fr_FR_39.png=415eb9aa50045f403f03bf90418a60da
-Graphics_fr_FR_40.png=76950c3a78d543018ca046b7e5709d88
-Graphics_fr_FR_41.png=949d08ca0d73f015692fe34327e6f479
+Graphics_fr_FR_35.png=caffc3a1e808e6c77f4b3507ccf2244d
+Graphics_fr_FR_36.png=2297699ec06e47b2fe0a18a86fd34c29
+Graphics_fr_FR_37.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
+Graphics_fr_FR_38.png=415eb9aa50045f403f03bf90418a60da
+Graphics_fr_FR_39.png=76950c3a78d543018ca046b7e5709d88
+Graphics_fr_FR_40.png=949d08ca0d73f015692fe34327e6f479
+Graphics_fr_FR_41.png=472c77f8a7f56a9ecded78b1cb041139
 Graphics_fr_FR_42.png=472c77f8a7f56a9ecded78b1cb041139
-Graphics_ja_JP_36.png=caffc3a1e808e6c77f4b3507ccf2244d
-Graphics_ja_JP_37.png=2297699ec06e47b2fe0a18a86fd34c29
-Graphics_ja_JP_38.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
-Graphics_ja_JP_39.png=415eb9aa50045f403f03bf90418a60da
-Graphics_ja_JP_40.png=76950c3a78d543018ca046b7e5709d88
-Graphics_ja_JP_41.png=949d08ca0d73f015692fe34327e6f479
+Graphics_ja_JP_35.png=caffc3a1e808e6c77f4b3507ccf2244d
+Graphics_ja_JP_36.png=2297699ec06e47b2fe0a18a86fd34c29
+Graphics_ja_JP_37.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
+Graphics_ja_JP_38.png=415eb9aa50045f403f03bf90418a60da
+Graphics_ja_JP_39.png=76950c3a78d543018ca046b7e5709d88
+Graphics_ja_JP_40.png=949d08ca0d73f015692fe34327e6f479
+Graphics_ja_JP_41.png=472c77f8a7f56a9ecded78b1cb041139
 Graphics_ja_JP_42.png=472c77f8a7f56a9ecded78b1cb041139
-Graphics_ru_RU_36.png=caffc3a1e808e6c77f4b3507ccf2244d
-Graphics_ru_RU_37.png=2297699ec06e47b2fe0a18a86fd34c29
-Graphics_ru_RU_38.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
-Graphics_ru_RU_39.png=415eb9aa50045f403f03bf90418a60da
-Graphics_ru_RU_40.png=76950c3a78d543018ca046b7e5709d88
-Graphics_ru_RU_41.png=949d08ca0d73f015692fe34327e6f479
+Graphics_ru_RU_35.png=caffc3a1e808e6c77f4b3507ccf2244d
+Graphics_ru_RU_36.png=2297699ec06e47b2fe0a18a86fd34c29
+Graphics_ru_RU_37.png=6ffc4cdec09ab46a1e5d4ae9fc119fc9
+Graphics_ru_RU_38.png=415eb9aa50045f403f03bf90418a60da
+Graphics_ru_RU_39.png=76950c3a78d543018ca046b7e5709d88
+Graphics_ru_RU_40.png=949d08ca0d73f015692fe34327e6f479
+Graphics_ru_RU_41.png=472c77f8a7f56a9ecded78b1cb041139
 Graphics_ru_RU_42.png=472c77f8a7f56a9ecded78b1cb041139
 INIMPL_f_1.png=abac7044fea3fc1a4f989661cfc42391
 INIMPL_f_fr_FR_1.png=83eb32af09f9e2231acc98c36b82dce2
@@ -150,7 +154,8 @@ STEP_FUNCTION_1.png=a0f3c8ffdd4693291dc1c322c9a02fc5
 STEP_FUNCTION_2.png=18359b7fac7dc5a8a2b2620d946b799d
 Sfgrayplot_1.png=b5139a9e5e0fd480bbafa10a88be5787
 Sfgrayplot_2.png=b5196dafdabb34691c6df65540b38f55
-Sfgrayplot_3.png=154f16b80fbb104ad4f7140460301a3
+Sfgrayplot_3.png=62dfa0f80a4796b2bb3f49b0c869c5cf
+Sfgrayplot_4.png=5ed6f3ce5c25c81f046e7359d9bc6e7d
 Sfgrayplot_pt_BR_3.png=bfff08659962454c62bebdd29f5abc76
 Sfgrayplot_ru_RU_3.png=fdc51bdfd90a86716c61a7cb6f7dc5af
 Sgrayplot_1.png=8d6dcf3e6709416d5d82127756c63996
index 30faa04..6ade00e 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_10.png and b/scilab/modules/helptools/images/Graphics_10.png differ
index 906d835..3e73616 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_11.png and b/scilab/modules/helptools/images/Graphics_11.png differ
index 5a73957..8723c9a 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_12.png and b/scilab/modules/helptools/images/Graphics_12.png differ
index 1cc8d34..2c30d83 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_13.png and b/scilab/modules/helptools/images/Graphics_13.png differ
index 34d4570..48ce284 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_14.png and b/scilab/modules/helptools/images/Graphics_14.png differ
index fc70743..bb59e84 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_15.png and b/scilab/modules/helptools/images/Graphics_15.png differ
index 254a8c4..5eff965 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_16.png and b/scilab/modules/helptools/images/Graphics_16.png differ
index a6f82f1..81d5317 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_17.png and b/scilab/modules/helptools/images/Graphics_17.png differ
index 8f76726..81d5317 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_18.png and b/scilab/modules/helptools/images/Graphics_18.png differ
index 8f76726..614fc32 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_19.png and b/scilab/modules/helptools/images/Graphics_19.png differ
index 69d0faf..e3b9f80 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_20.png and b/scilab/modules/helptools/images/Graphics_20.png differ
index d65e55f..5be448e 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_21.png and b/scilab/modules/helptools/images/Graphics_21.png differ
index 5be448e..6cc249f 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_23.png and b/scilab/modules/helptools/images/Graphics_23.png differ
index a152dc1..6ade00e 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_24.png and b/scilab/modules/helptools/images/Graphics_24.png differ
index 9a07989..73e1fb4 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_25.png and b/scilab/modules/helptools/images/Graphics_25.png differ
index 19b9d98..7ba334b 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_26.png and b/scilab/modules/helptools/images/Graphics_26.png differ
index 2bf891e..af7744c 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_27.png and b/scilab/modules/helptools/images/Graphics_27.png differ
index 12cd325..a7fc405 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_28.png and b/scilab/modules/helptools/images/Graphics_28.png differ
index 4fe83be..c5ae798 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_29.png and b/scilab/modules/helptools/images/Graphics_29.png differ
index 8e52d4e..90bd161 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_30.png and b/scilab/modules/helptools/images/Graphics_30.png differ
index 56593b8..cb9ad5e 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_31.png and b/scilab/modules/helptools/images/Graphics_31.png differ
index b17c513..0a0e20b 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_32.png and b/scilab/modules/helptools/images/Graphics_32.png differ
index 26941fa..3976f69 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_33.png and b/scilab/modules/helptools/images/Graphics_33.png differ
index e7821c1..5eff032 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_34.png and b/scilab/modules/helptools/images/Graphics_34.png differ
index d4e2154..3adc9cd 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_9.png and b/scilab/modules/helptools/images/Graphics_9.png differ
diff --git a/scilab/modules/helptools/images/Graphics_en_US_35.png b/scilab/modules/helptools/images/Graphics_en_US_35.png
new file mode 100644 (file)
index 0000000..68df9a7
Binary files /dev/null and b/scilab/modules/helptools/images/Graphics_en_US_35.png differ
index 1a0565b..9e2456b 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_en_US_36.png and b/scilab/modules/helptools/images/Graphics_en_US_36.png differ
index 2af22e8..797e52a 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_en_US_37.png and b/scilab/modules/helptools/images/Graphics_en_US_37.png differ
index d44e0f4..802effa 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_en_US_38.png and b/scilab/modules/helptools/images/Graphics_en_US_38.png differ
index bce2fdd..ed0ff69 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_en_US_39.png and b/scilab/modules/helptools/images/Graphics_en_US_39.png differ
index d3b643b..44befdb 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_en_US_40.png and b/scilab/modules/helptools/images/Graphics_en_US_40.png differ
index 438834c..cd98ce3 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_en_US_41.png and b/scilab/modules/helptools/images/Graphics_en_US_41.png differ
diff --git a/scilab/modules/helptools/images/Graphics_fr_FR_35.png b/scilab/modules/helptools/images/Graphics_fr_FR_35.png
new file mode 100644 (file)
index 0000000..081d8be
Binary files /dev/null and b/scilab/modules/helptools/images/Graphics_fr_FR_35.png differ
index 38c15ea..c32830e 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_fr_FR_36.png and b/scilab/modules/helptools/images/Graphics_fr_FR_36.png differ
index 769d4ca..c44ce24 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_fr_FR_37.png and b/scilab/modules/helptools/images/Graphics_fr_FR_37.png differ
index d44e0f4..a942ff4 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_fr_FR_38.png and b/scilab/modules/helptools/images/Graphics_fr_FR_38.png differ
index b7ce6bb..10a3209 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_fr_FR_39.png and b/scilab/modules/helptools/images/Graphics_fr_FR_39.png differ
index d3b643b..536b2d8 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_fr_FR_40.png and b/scilab/modules/helptools/images/Graphics_fr_FR_40.png differ
index cea4baf..478d691 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_fr_FR_41.png and b/scilab/modules/helptools/images/Graphics_fr_FR_41.png differ
diff --git a/scilab/modules/helptools/images/Graphics_ja_JP_35.png b/scilab/modules/helptools/images/Graphics_ja_JP_35.png
new file mode 100644 (file)
index 0000000..33959b5
Binary files /dev/null and b/scilab/modules/helptools/images/Graphics_ja_JP_35.png differ
index 1851b67..84f8e0f 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_36.png and b/scilab/modules/helptools/images/Graphics_ja_JP_36.png differ
index c3ea262..262abfa 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_37.png and b/scilab/modules/helptools/images/Graphics_ja_JP_37.png differ
index 66f8542..be10a4c 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_38.png and b/scilab/modules/helptools/images/Graphics_ja_JP_38.png differ
index fe8d89c..9563ee9 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_39.png and b/scilab/modules/helptools/images/Graphics_ja_JP_39.png differ
index 1f48602..2e425cd 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_40.png and b/scilab/modules/helptools/images/Graphics_ja_JP_40.png differ
index 600275d..5755c72 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_41.png and b/scilab/modules/helptools/images/Graphics_ja_JP_41.png differ
diff --git a/scilab/modules/helptools/images/Graphics_ru_RU_35.png b/scilab/modules/helptools/images/Graphics_ru_RU_35.png
new file mode 100644 (file)
index 0000000..827a0b3
Binary files /dev/null and b/scilab/modules/helptools/images/Graphics_ru_RU_35.png differ
index 2d9c2a3..7ec3f09 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ru_RU_36.png and b/scilab/modules/helptools/images/Graphics_ru_RU_36.png differ
index 0fad9d8..0e6b783 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ru_RU_37.png and b/scilab/modules/helptools/images/Graphics_ru_RU_37.png differ
index 8982cb3..0f1713f 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ru_RU_38.png and b/scilab/modules/helptools/images/Graphics_ru_RU_38.png differ
index b887429..10a3209 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ru_RU_39.png and b/scilab/modules/helptools/images/Graphics_ru_RU_39.png differ
index d3b643b..928bf32 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ru_RU_40.png and b/scilab/modules/helptools/images/Graphics_ru_RU_40.png differ
index 9067a56..bc6d760 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ru_RU_41.png and b/scilab/modules/helptools/images/Graphics_ru_RU_41.png differ
index ccb8ab7..d163cae 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_1.png and b/scilab/modules/helptools/images/Sfgrayplot_1.png differ
index fb98aca..e03d1a6 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_2.png and b/scilab/modules/helptools/images/Sfgrayplot_2.png differ
index c967392..d34c5c6 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_3.png and b/scilab/modules/helptools/images/Sfgrayplot_3.png differ
diff --git a/scilab/modules/helptools/images/Sfgrayplot_4.png b/scilab/modules/helptools/images/Sfgrayplot_4.png
new file mode 100644 (file)
index 0000000..7b1e960
Binary files /dev/null and b/scilab/modules/helptools/images/Sfgrayplot_4.png differ