* Bug 14425 fixed - xpause() set obsolete, merged in sleep(). sleep(,'s') implemented 27/17927/10
dhanrajacharya44 [Tue, 15 Mar 2016 19:16:20 +0000 (00:16 +0530)]
Change-Id: I8bc373f6104a6929f1f1e1f5375ad76d6935d5ee

27 files changed:
scilab/CHANGES
scilab/modules/graphics/help/en_US/Graphics.xml
scilab/modules/graphics/help/en_US/color_management/hsv2rgb.xml
scilab/modules/graphics/help/en_US/xpause.xml [deleted file]
scilab/modules/graphics/help/fr_FR/Graphics.xml
scilab/modules/graphics/help/fr_FR/xpause.xml [deleted file]
scilab/modules/graphics/help/ja_JP/Graphics.xml
scilab/modules/graphics/help/ja_JP/color_management/hsv2rgb.xml
scilab/modules/graphics/help/ja_JP/xpause.xml [deleted file]
scilab/modules/graphics/help/pt_BR/Graphics.xml
scilab/modules/graphics/help/pt_BR/color_management/hsv2rgb.xml
scilab/modules/graphics/help/pt_BR/xpause.xml [deleted file]
scilab/modules/graphics/help/ru_RU/Graphics.xml
scilab/modules/graphics/help/ru_RU/xpause.xml [deleted file]
scilab/modules/graphics/tests/nonreg_tests/bug_502.dia.ref
scilab/modules/graphics/tests/nonreg_tests/bug_502.tst
scilab/modules/graphics/tests/unit_tests/captions.dia.ref
scilab/modules/graphics/tests/unit_tests/captions.tst
scilab/modules/gui/tests/nonreg_tests/bug_4075.tst
scilab/modules/m2sci/help/en_US/m2sci_equivalents/o/pause.xml
scilab/modules/m2sci/macros/sci_files/sci_pause.sci
scilab/modules/m2sci/tests/unit_tests/conversion/PAUSE.dia.ref
scilab/modules/time/help/en_US/sleep.xml
scilab/modules/time/help/fr_FR/sleep.xml
scilab/modules/time/help/ja_JP/sleep.xml [deleted file]
scilab/modules/time/sci_gateway/c/sci_sleep.c
scilab/modules/time/sci_gateway/c/sci_xpause.c

index f66c82e..83dcbc5 100644 (file)
@@ -111,6 +111,9 @@ Other feature additions
 
 * sign() can now handle a sparse matrix.
 
+* sleep(..,'s') allows now to specify the duration in seconds.
+
+
 Installation
 ============
 
@@ -206,6 +209,7 @@ Data Structures
 
 Removed Functions
 ==================
+* xpause will be removed in Scilab 6.1. Please use sleep() instead.
 
 * maxfiles function is now obsolete.
 
@@ -347,6 +351,8 @@ In 6.0.0:
 
 * Bug #14423 fixed - bench_run did not have a return value, export file was not configurable
 
+* Bug #14425 fixed - xpause() was a duplicate of sleep(). sleep() did not propose "s" time unit.
+
 * Bug #14429 fixed - rationals r+(-r) and r-r did not simplify the denominator to 1 in simp_mode(%t)
 
 * Bug #14433 fixed - acoth (which call atanh) crash scilab
@@ -732,3 +738,4 @@ In 6.0.0 alpha-2 and earlier:
                      exactly "pvApyCtx" when macros are used in a gateway.
 
 * Bug #14044 fixed - MALLOC.h is now renamed to sci_malloc.h.
index 5a9b983..823f1d9 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="xpause">xpause</link>
-                </term>
-                <listitem>
-                    <para>Suspend Scilab</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>
                     <link linkend="show_window">show_window</link>
                 </term>
                 <listitem>
         </variablelist>
     </refsection>
 </refentry>
+
index 1fe7a24..13871f2 100644 (file)
@@ -26,7 +26,7 @@
             rgb = hsv2rgb(hsv)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
@@ -87,7 +87,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>The function hsv2rgb converts colormaps
             between the RGB and HSV color spaces. As hue varies from 0 to 1.0,
             corresponding colors become increasingly brighter.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-t=[0:0.3:2*%pi]'; z=sin(t)*cos(t');
+t = [0:0.3:2*%pi]'; 
+z = sin(t)*cos(t');
 plot3d1(t,t,z)
-f=gcf();
-for h=0:0.1:1
-  hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
-  f.color_map=hsv2rgb(hsv);
-  xpause(10000)
+f = gcf();
+for h = 0:0.1:1
+  hsv = [h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
+  f.color_map = hsv2rgb(hsv);
+  sleep(10)
 end
-for v=0:0.1:1
-  hsv=[ones(32,1) linspace(0,1,32)' v*ones(32,1)];
-  f.color_map=hsv2rgb(hsv);
-  xpause(10000)
+for v = 0:0.1:1
+  hsv = [ones(32,1) linspace(0,1,32)' v*ones(32,1)];
+  f.color_map = hsv2rgb(hsv);
+  sleep(10)
 end
  ]]></programlisting>
         <scilab:image>
@@ -129,6 +130,6 @@ end
             f.color_map=hsv2rgb(hsv);
             end
         </scilab:image>
-        
     </refsection>
 </refentry>
+
diff --git a/scilab/modules/graphics/help/en_US/xpause.xml b/scilab/modules/graphics/help/en_US/xpause.xml
deleted file mode 100644 (file)
index 4662039..0000000
+++ /dev/null
@@ -1,61 +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" xml:id="xpause">
-    <refnamediv>
-        <refname>xpause</refname>
-        <refpurpose>suspend Scilab</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>xpause(microsecs)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>microsecs</term>
-                <listitem>
-                    <para>an integer, the number of microseconds.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <function>xpause</function> suspends the current process for the
-            number of microseconds specified by the argument
-            <varname>microsecs</varname>. The actual suspension time may
-            be longer because of other activities in the system, or because of
-            the time spent in processing the call.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-t=[0:0.3:2*%pi]';
-z=sin(t)*cos(t'); 
-plot3d1(t,t,z) 
-f=gcf();
-for h=0:0.1:1
-  hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
-  f.color_map=hsv2rgb(hsv);
-  drawnow()
-  xpause(100000)
-end
- ]]></programlisting>
-    </refsection>
-</refentry>
index 54fffa4..9b2edd1 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="xpause">xpause</link>
-                </term>
-                <listitem>
-                    <para>suspend l'exécution de Scilab</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>
                     <link linkend="show_window">show_window</link>
                 </term>
                 <listitem>
         </variablelist>
     </refsection>
 </refentry>
+
diff --git a/scilab/modules/graphics/help/fr_FR/xpause.xml b/scilab/modules/graphics/help/fr_FR/xpause.xml
deleted file mode 100644 (file)
index 901fcb2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="xpause">
-    <refnamediv>
-        <refname>xpause</refname>
-        <refpurpose>interrompt Scilab pendant une durée donnée   </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>xpause(microsecs)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>xpause</literal> interrompt Scilab pendant un temps donné en microsecondes
-            spécifié par l'argument. Le temps de pause peut être plus long que prévu
-            à cause de l'activité du système, ou bien tout simplement à cause du temps passé pendant l'appel lui même.
-        </para>
-    </refsection>
-</refentry>
index 8fa14f0..f95e11e 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) INRIA
-
  *
-
-
  * 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="Graphics">
-    
     <refnamediv>
-        
         <refname>Graphics: Getting started</refname>
-        
         <refpurpose>グラフィックライブラリの概要</refpurpose>
-        
     </refnamediv>
-    
     <refsection>
-        
         <title>2次元プロット</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plot2d">plot2d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>曲線をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>plot2d();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plot2d2">plot2d2</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>曲線をステップ関数としてプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>plot2d2();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plot2d3">plot2d3</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>垂直棒グラフで曲線をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>plot2d3();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plot2d4">plot2d4</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>矢印で曲線をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>plot2d4();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="fplot2d">fplot2d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>関数で定義された曲線をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>fplot2d();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="champ">champ</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>2次元ベクトルフィールド</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>champ();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="champ1">champ1</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カラー矢印で2次元ベクトルフィールド</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>champ1();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="fchamp">fchamp</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>2次元1階ODE方向フィールド</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>fchamp();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="contour2d">contour2d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>2次元プロット上に曲面の等高線をプロット</para>
-                    
                 </listitem>
-                
             </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>
-                    
                     <para>カラーで曲面の2次元プロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>grayplot();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="fgrayplot">fgrayplot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>関数で定義された曲面をカラーで2次元プロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>fgrayplot();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="Sgrayplot">Sgrayplot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>曲面の平滑化されたカラー2次元プロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>Sgrayplot();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="Sfgrayplot">Sfgrayplot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>関数により定義された曲面の平滑化されたカラー2次元プロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>Sfgrayplot();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xgrid">xgrid</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>2次元プロットにグリッドを追加</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>x=[0:0.1:2*%pi]'; plot2d(sin(x));xgrid(5)</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="errbar">errbar</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>2次元プロットに垂直誤差バーを追加</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>errbar();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="histplot">histplot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ヒストグラムをプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>histplot();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="Matplot">Matplot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>行列の2次元カラープロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>Matplot();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>3次元プロット</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plot3d">plot3d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>曲面をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>plot3d();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plot3d1">plot3d1</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>曲面を白黒またはカラーレベルでプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>plot3d1();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="fplot3d">fplot3d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>関数で定義された曲面をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>fplot3d();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="fplot3d1">fplot3d1</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>関数で定義された曲面を白黒またはカラーレベルでプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>fplot3d1();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="param3d">param3d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>曲面をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>param3d();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="param3d1">param3d1</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数の曲線をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>param3d1();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="contour">contour</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>3次元曲面の上に等高線をプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>contour();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="fcontour">fcontour</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>関数で定義された3次元曲面に等高線を描画</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>fcontour();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="hist3d">hist3d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ヒストグラムの3次元表現3</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>hist3d();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="genfac3d">genfac3d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>3次元曲面の小平面を計算</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>genfac3d();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="eval3dp">eval3dp</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>3次元曲面の小平面を計算</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>p1=linspace(0,2*%pi,10);
-                            
                             p2=linspace(0,2*%pi,10);
-                            
                             deff("[x,y,z]=scp(p1,p2)",["x=p1.*sin(p1).*cos(p2)";..
-                            
                             "y=p1.*cos(p1).*cos(p2)";..
-                            
                             "z=p1.*sin(p2)"])
-                            
                             [Xf,Yf,Zf]=eval3dp(scp,p1,p2);
-                            
                             plot3d(Xf,Yf,Zf)
-                            
                         </scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="geom3d">geom3d</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>3次元プロットの後,3次元から2次元に投影</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>deff("[z]=surface(x,y)","z=sin(x)*cos(y)")
-                            
                             t=%pi*(-10:10)/10;
-                            
                             // 3D plot of the surface
-                            
                             fplot3d(t,t,surface,35,45,"X@Y@Z")
-                            
                             // now (t,t,sin(t).*cos(t)) is a curve on the surface
-                            
                             // which can be drawn using geom3d and xpoly
-                            
                             [x,y]=geom3d(%pi/2,0,surface(%pi/2,0))
-                            
                         </scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>線およびポリゴンのプロット</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xpoly">xpoly</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ポリラインまたはポリゴンを描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xpolys">xpolys</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数のポリラインまたはポリゴンを描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xrpoly">xrpoly</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>基準ポリゴンを描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xsegs">xsegs</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>未接続の線分を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xfpoly">xfpoly</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ポリゴンを塗りつぶす</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xfpolys">xfpolys</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数のポリゴンを塗りつぶす</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>矩形のプロット</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xrect">xrect</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>矩形を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xfrect">xfrect</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>矩形を塗りつぶす</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xrects">xrects</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数の矩形を描画または塗りつぶす</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>弧のプロット</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xarc">xarc</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>楕円の一部を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xarcs">xarcs</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数の楕円の一部を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xfarc">xfarc</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>楕円の一部を塗りつぶす</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xfarcs">xfarcs</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数の楕円の一部を塗りつぶす</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>矢印のプロット</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xarrows">xarrows</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数の矢印を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>文字列</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xstring">xstring</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>文字列を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xstringl">xstringl</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>文字列を囲うボックスを計算</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xstringb">xstringb</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ボックス内に文字列を描画</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>xstringb();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xtitle">xtitle</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックウインドウにタイトルを追加</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>xtitle();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="titlepage">titlepage</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックウインドウの中央にタイトルを追加</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xinfo">xinfo</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>メッセージサブウインドウにinfo 文字列を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>フレームおよび軸</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="drawaxis">drawaxis</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>軸を描画</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="graduate">graduate</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>見栄えの良い軸のグラデーション</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plotframe">plotframe</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>目盛およびグリッドを有するフレームをプロット</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>座標変換</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="isoview">isoview</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>等軸プロットにスケールを設定 (ウインドウの大きさは変更されません)</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="square">square</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>等軸プロットにスケールを設定 (ウインドウの大きさを変更)</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="scaling">scaling</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数の点のアフィン変換</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="rotate">rotate</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>複数の点の回転</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xsetech">xsetech</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックウインドウの中にプロット用のサブウインドウを設定</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="subplot">subplot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックウインドウをサブウインドウの行列に分割</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xgetech">xgetech</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カレントのグラフィックのスケールを取得</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xchange">xchange</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>実際の値からピクセル座標に変換</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>色</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="colormap">colormap</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カラーマップを使用</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="getcolor">getcolor</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カレントのカラーマップの色を選択するためのダイアログを表示</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="addcolor">addcolor</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カレントのカラーマップに新しい色を追加</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="graycolormap">graycolormap</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>線形グレーカラーマップ</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="hotcolormap">hotcolormap</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>赤から黄色に至るカラーマップ</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>グラフィックコンテキスト</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xset">xset</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックコンテキストの値を設定</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xget">xget</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックコンテキストのカレントの値を取得</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xlfont">xlfont</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックコンテキストにフォントをロード,
-                        
                         またはロード済みのフォントを検索する
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>保存および読み込み</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xsave">xsave</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをファイルに保存</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xload">xload</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>保存されたグラフィックを読み込む</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2bmp">xs2bmp</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをBMP形式でエクスポート</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2emf">xs2emf</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         グラフィックをEMF形式でエクスポート
-                        
                         <warning>
-                            
                             Windowsのみ.
-                            
                         </warning>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2eps">xs2eps</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをEPS形式でエクスポート</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2gif">xs2gif</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをGIF形式でエクスポート</para>
-                    
                 </listitem>
-                
                 <varlistentry>
-                    
                     <term>
-                        
                         <link linkend="xs2jpg">xs2jpg</link>
-                        
                     </term>
-                    
                     <listitem>
-                        
                         <para>グラフィックをJPG形式でエクスポート</para>
-                        
                     </listitem>
-                    
                 </varlistentry>
-                
                 <varlistentry>
-                    
                     <term>
-                        
                         <link linkend="xs2pdf">xs2pdf</link>
-                        
                     </term>
-                    
                     <listitem>
-                        
                         <para>グラフィックをPDF形式でエクスポート</para>
-                        
                     </listitem>
-                    
                 </varlistentry>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2png">xs2png</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをPNG形式でエクスポート</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2ppm">xs2ppm</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをPPM形式でエクスポート</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2ps">xs2ps</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをPS形式でエクスポート</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xs2svg">xs2svg</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックをSVG形式でエクスポート</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>グラフィックプリミティブ</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="clf">clf</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックウインドウをクリアし,関連する
-                        
                         記録済みのグラフィックを消去します.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xclear">xclear</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         グラフィックウインドウをクリア
-                        
                         <warning>
-                            
                             関数 <function>xclear</function> は廃止されました.
-                            
                         </warning>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="driver">driver</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックドライバを選択</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xinit">xinit</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックドライバの初期化</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xend">xend</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックセッションを閉じる</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="replot">replot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カレントのグラフィックウインドを新しい境界値で再描画</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>
-                    
-                    <link linkend="xpause">xpause</link>
-                    
-                </term>
-                
-                <listitem>
-                    
-                    <para>Scilab処理を中断する</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="show_window">show_window</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カレントのグラフィックウインドウを前面に移動</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xdel">xdel</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックウインドウを削除</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="winsid">winsid</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>グラフィックウインドウのリストを返す</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xname">xname</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>カレントのグラフィックウインドウの名前を変更</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>マウスの位置</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xclick">xclick</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         マウスクリックまたはグラフィックウインドウのイベントを待つ
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="locate">locate</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>マウスで複数の点を選択</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="xgetmouse">xgetmouse</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>マウスイベントおよび現在位置を取得</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>対話的エディタ</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="edit_curv">edit_curv</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>対話的なグラフィック曲線エディタ</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>自動制御用のグラフィック関数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="bode">bode</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ボード線図</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>s=poly(0,'s')
-                            
                             h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-                            
                             clf();bode(h,0.01,100);
-                            
                         </scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="gainplot">gainplot</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ゲインプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>s=poly(0,'s')
-                            
                             h1=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-                            
                             h2=syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
-                            
                             clf();gainplot([h1;h2],0.01,100,['h1';'h2'])
-                            
                             title('Gainplot');
-                            
                         </scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="nyquist">nyquist</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ナイキストプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>s=poly(0,'s')
-                            
                             h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                            
                             h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
-                            
                             nyquist(h1)
-                            
                             ax=gca();
-                            
                             h_h=ax.children($).children(2);
-                            
                             tip=datatipCreate(h_h,[1.331,0.684]);
-                            
                             datatipSetOrientation(tip,"upper left");
-                            
                         </scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="m_circle">m_circle</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>M-サークル プロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image>m_circle();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="hallchart">hallchart</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         Hall chart
-                        
                     </para>
-                    
                     <para>
-                        
                         <emphasis role="bold">Example:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image localized="true">hallchart();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="nicholschart">nicholschart</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ニコルス線図</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image localized="true">nicholschart();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="black">black</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>ブラック線図</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image localized="true">s=poly(0,'s');
-                            
                             sl=syslin('c',5*(1+s)/(.1*s^4+s^3+15*s^2+3*s+1))
-                            
                             clf();black(sl,0.01,10);
-                            
                         </scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="evans">evans</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>根軌跡</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image localized="true">evans();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="sgrid">sgrid</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>s面グリッド線</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image localized="true">sgrid(0:0.2:1,[0.2 0.6 1 1.7 2])</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="plzr">plzr</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>極ゼロプロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image localized="true">s=poly(0,'s');
-                            
                             n=[1+s   2+3*s+4*s^2        5; 0        1-s             s];
-                            
                             d=[1+3*s   5-s^3           s+1;1+s     1+s+s^2      3*s-1];
-                            
                             h=syslin('c',n./d);
-                            
                             plzr(h);
-                            
                         </scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>
-                    
                     <link linkend="zgrid">zgrid</link>
-                    
                 </term>
-                
                 <listitem>
-                    
                     <para>zgrid プロット</para>
-                    
                     <para>
-                        
                         <emphasis role="bold">例:</emphasis>
-                        
                     </para>
-                    
                     <para>
-                        
                         <scilab:image localized="true">zgrid();</scilab:image>
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
 </refentry>
 
index ae0e34a..3fe858a 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) INRIA - Serge Steer
-
  * 
-
-
  * 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="hsv2rgb">
-    
     <refnamediv>
-        
         <refname>hsv2rgb</refname>
-        
         <refpurpose>HSV カラーを RGBに変換する</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>[r,g,b] = hsv2rgb(h,s,v)
-            
             rgb = hsv2rgb(h,s,v)
-            
             [r,g,b] = hsv2rgb(hsv)
-            
             rgb = hsv2rgb(hsv)
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="parameters">
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>h</term>
-                
                 <listitem>
-                    
                     <para>大きさnのベクトル. "hue" の値.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>s</term>
-                
                 <listitem>
-                    
                     <para>大きさnのベクトル. "saturation" の値.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>v</term>
-                
                 <listitem>
-                    
                     <para>大きさnのベクトル. "value" の値
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>hsv</term>
-                
                 <listitem>
-                    
                     <para> n x 3行列. 各行には [hue saturation value] の組が含まれます.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>r</term>
-                
                 <listitem>
-                    
                     <para>大きさ nの列ベクトル. 対応する"red" の値.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>g</term>
-                
                 <listitem>
-                    
                     <para>大きさ nの列ベクトル. 対応する"green" の値.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>b</term>
-                
                 <listitem>
-                    
                     <para>大きさ nの列ベクトル. 対応する"blue" の値.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>rgb</term>
-                
                 <listitem>
-                    
                     <para> n x 3 行列. 各行には [red green blue] の組が含まれます.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>関数 hsv2rgb はRGBおよびHSV色空間の間でカラーマップを変換します.
-            
             hue値が 0 から 1.0 まで変化する時,
-            
             対応する色は赤から黄色,緑,シアン,青,マゼンタ,そして赤に戻ります.
-            
             実際に赤の値は 0 および 1.0の両方に存在します.
-            
             saturationが 0 から 1.0 まで変化する時,
-            
             対応する色 (hues) は飽和していない色(灰色の影)から(白色要素が存在しない)
-            
             完全に飽和した色まで変化します.
-            
             valueまたはbrightnessが 0 から 1.0 まで変化する時,
-            
             対応する色の輝度は増加します.
-            
         </para>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
         <programlisting role="example"><![CDATA[ 
-
-t=[0:0.3:2*%pi]'; z=sin(t)*cos(t'); 
-
+t = [0:0.3:2*%pi]'; 
+z = sin(t)*cos(t'); 
 plot3d1(t,t,z) 
-
-f=gcf();
-
-for h=0:0.1:1
-
-  hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
-
-  f.color_map=hsv2rgb(hsv);
-
-  xpause(10000)
-
+f = gcf();
+for h = 0:0.1:1
+  hsv = [h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
+  f.color_map = hsv2rgb(hsv);
+  sleep(10)
 end
-
-for v=0:0.1:1
-
-  hsv=[ones(32,1) linspace(0,1,32)' v*ones(32,1)];
-
-  f.color_map=hsv2rgb(hsv);
-
-  xpause(10000)
-
+for v = 0:0.1:1
+  hsv = [ones(32,1) linspace(0,1,32)' v*ones(32,1)];
+  f.color_map = hsv2rgb(hsv);
+  sleep(10)
 end
-
  ]]></programlisting>
-        
         <scilab:image>
-            
             t=[0:0.3:2*%pi]'; z=sin(t)*cos(t');
-            
             plot3d1(t,t,z)
-            
             f=gcf();
-            
             for h=0:0.1:1
-            
             hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
-            
             f.color_map=hsv2rgb(hsv);
-            
             end
-            
             for v=0:0.1:1
-            
             hsv=[ones(32,1) linspace(0,1,32)' v*ones(32,1)];
-            
             f.color_map=hsv2rgb(hsv);
-            
             end
-            
         </scilab:image>
-        
     </refsection>
-    
 </refentry>
 
diff --git a/scilab/modules/graphics/help/ja_JP/xpause.xml b/scilab/modules/graphics/help/ja_JP/xpause.xml
deleted file mode 100644 (file)
index 60218c1..0000000
+++ /dev/null
@@ -1,116 +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="xpause">
-    
-    <refnamediv>
-        
-        <refname>xpause</refname>
-        
-        <refpurpose>Scilabを中断</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>xpause(microsecs)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>microsecs</term>
-                
-                <listitem>
-                    
-                    <para>整数, マイクロ秒.</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <function>xpause</function>は,引数で指定したマイクロ秒間
-            
-            カレントのプロセスを中断します.
-            
-            実際の中断時間は,システムの他のアクティビティのせいで
-            
-            またはコールを処理する際に使用する時間のせいで,
-            
-            長くなる可能性があります.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-
-t=[0:0.3:2*%pi]';
-
-z=sin(t)*cos(t'); 
-
-plot3d1(t,t,z) 
-
-f=gcf();
-
-for h=0:0.1:1
-
-  hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
-
-  f.color_map=hsv2rgb(hsv);
-
-  drawnow()
-
-  xpause(100000)
-
-end
-
- ]]></programlisting>
-        
-    </refsection>
-    
-</refentry>
-
index af0bcb8..ec2e210 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: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="Graphics" xml:lang="en">
     <refnamediv>
         <refname>Graphics</refname>
-        <refpurpose>Resumo da biblioteca de gráficos</refpurpose>
+        <refpurpose>Resumo da biblioteca de gráficos</refpurpose>
     </refnamediv>
     <refsection>
         <title>Desenhos 2d</title>
             <varlistentry>
                 <term>plot2d</term>
                 <listitem>
-                    <para>esboço 2d</para>
+                    <para>esboço 2d</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>plot2d2</term>
                 <listitem>
-                    <para>esboço 2d (funções de degraus)</para>
+                    <para>esboço 2d (funções de degraus)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>plot2d3</term>
                 <listitem>
-                    <para>esboço 2d (barras veticais)</para>
+                    <para>esboço 2d (barras veticais)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>plot2d4</term>
                 <listitem>
-                    <para>esboço 2d (setas)</para>
+                    <para>esboço 2d (setas)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>fplot2d</term>
                 <listitem>
-                    <para>esboço 2d de uma curva definida por uma função</para>
+                    <para>esboço 2d de uma curva definida por uma função</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>champ</term>
                 <listitem>
-                    <para>esboço de campo vetorial 2d</para>
+                    <para>esboço de campo vetorial 2d</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             <varlistentry>
                 <term>contour2d</term>
                 <listitem>
-                    <para>curvas de nível de uma superfície em um esboço 2d</para>
+                    <para>curvas de nível de uma superfície em um esboço 2d</para>
                 </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>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>esboço 2d de uma superfície utilizando-se cores</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>fgrayplot</term>
                 <listitem>
-                    <para>esboço 2d de uma superfície definida por uma função utilizando
+                    <para>esboço 2d de uma superfície definida por uma função utilizando
                         cores
                     </para>
                 </listitem>
             <varlistentry>
                 <term>Sgrayplot</term>
                 <listitem>
-                    <para>esboço 2d suave de uma superfície utilizando cores</para>
+                    <para>esboço 2d suave de uma superfície utilizando cores</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>Sfgrayplot</term>
                 <listitem>
-                    <para>esboço 2d suave de uma superfície definida por uma função
+                    <para>esboço 2d suave de uma superfície definida por uma função
                         utilizando cores
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xgrid</term>
                 <listitem>
-                    <para>adiciona um grid em um esboço 2d</para>
+                    <para>adiciona um grid em um esboço 2d</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>errbar</term>
                 <listitem>
-                    <para>adiciona barras de erro veriticais a um esboço 2d</para>
+                    <para>adiciona barras de erro veriticais a um esboço 2d</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>histplot</term>
                 <listitem>
-                    <para>esboça um histograma</para>
+                    <para>esboça um histograma</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>Matplot</term>
                 <listitem>
-                    <para>esboço 2d de uma matriz utilizando-se cores</para>
+                    <para>esboço 2d de uma matriz utilizando-se cores</para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <varlistentry>
                 <term>plot3d</term>
                 <listitem>
-                    <para>esboço 3d de uma superfície</para>
+                    <para>esboço 3d de uma superfície</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>plot3d1</term>
                 <listitem>
-                    <para>esboço 3d em níveis de cinza ou de cores de uma
-                        superfície
+                    <para>esboço 3d em níveis de cinza ou de cores de uma
+                        superfície
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>fplot3d</term>
                 <listitem>
-                    <para>esboço 3d de uma superfície definida por uma função</para>
+                    <para>esboço 3d de uma superfície definida por uma função</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>fplot3d1</term>
                 <listitem>
-                    <para>esboço 3d em escala de cinza ou colorido de nível de uma
-                        superfície definida por uma função
+                    <para>esboço 3d em escala de cinza ou colorido de nível de uma
+                        superfície definida por uma função
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>param3d</term>
                 <listitem>
-                    <para>esboço 3d de uma curva parametrizada</para>
+                    <para>esboço 3d de uma curva parametrizada</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>param3d1</term>
                 <listitem>
-                    <para>esboço 3d de curvas parametrizadas</para>
+                    <para>esboço 3d de curvas parametrizadas</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>contour</term>
                 <listitem>
-                    <para>curvas de nível em uma superfície 3d</para>
+                    <para>curvas de nível em uma superfície 3d</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>fcontour</term>
                 <listitem>
-                    <para>curvas de nível sobre uma superfície 3d definida por uma
-                        função
+                    <para>curvas de nível sobre uma superfície 3d definida por uma
+                        função
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>hist3d</term>
                 <listitem>
-                    <para>representação 3d de um histograma</para>
+                    <para>representação 3d de um histograma</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>genfac3d</term>
                 <listitem>
-                    <para>computa facetas de uma superfície 3d</para>
+                    <para>computa facetas de uma superfície 3d</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>eval3dp</term>
                 <listitem>
-                    <para>computa facetas 3d de uma superfície parametrizada</para>
+                    <para>computa facetas 3d de uma superfície parametrizada</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>geom3d</term>
                 <listitem>
-                    <para>projeção 3d para 2d após um esboço 3d</para>
+                    <para>projeção 3d para 2d após um esboço 3d</para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <varlistentry>
                 <term>xpoly</term>
                 <listitem>
-                    <para>desenha uma poligonal ou um polígono</para>
+                    <para>desenha uma poligonal ou um polígono</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xpolys</term>
                 <listitem>
-                    <para>desenha um conjunto de poligonais ou polígonos</para>
+                    <para>desenha um conjunto de poligonais ou polígonos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xrpoly</term>
                 <listitem>
-                    <para>desenha um polígono regular</para>
+                    <para>desenha um polígono regular</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             <varlistentry>
                 <term>xfpoly</term>
                 <listitem>
-                    <para>preenche um polígono</para>
+                    <para>preenche um polígono</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xfpolys</term>
                 <listitem>
-                    <para>preenche um conjunto de polígonos</para>
+                    <para>preenche um conjunto de polígonos</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Desenho de retângulos</title>
+        <title>Desenho de retângulos</title>
         <variablelist>
             <varlistentry>
                 <term>xrect</term>
                 <listitem>
-                    <para>desenha um retângulo</para>
+                    <para>desenha um retângulo</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xfrect</term>
                 <listitem>
-                    <para>preenche um retângulo</para>
+                    <para>preenche um retângulo</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xrects</term>
                 <listitem>
-                    <para>desenha ou preenche um conjunto de retângulos</para>
+                    <para>desenha ou preenche um conjunto de retângulos</para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <varlistentry>
                 <term>xarc</term>
                 <listitem>
-                    <para>esboça parte de uma elipse</para>
+                    <para>esboça parte de uma elipse</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             <varlistentry>
                 <term>xtitle</term>
                 <listitem>
-                    <para>adidciona títulos a janelas de gráficos</para>
+                    <para>adidciona títulos a janelas de gráficos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>titlepage</term>
                 <listitem>
-                    <para>adiciona título no meio de uma janela de gráficos</para>
+                    <para>adiciona título no meio de uma janela de gráficos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xinfo</term>
                 <listitem>
-                    <para>escreve um string de informação na subjanela de
+                    <para>escreve um string de informação na subjanela de
                         mensagens
                     </para>
                 </listitem>
             <varlistentry>
                 <term>graduate</term>
                 <listitem>
-                    <para>graduação de eixos</para>
+                    <para>graduação de eixos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>plotframe</term>
                 <listitem>
-                    <para>esboça uma moldura com escalas e grides. Esta função está
+                    <para>esboça uma moldura com escalas e grides. Esta função está
                         obsoleta.
                     </para>
                 </listitem>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Transformações de coordenadas</title>
+        <title>Transformações de coordenadas</title>
         <variablelist>
             <varlistentry>
                 <term>isoview</term>
                 <listitem>
-                    <para>ajusta escalas para esboço isométrico (não muda o tamanho da
+                    <para>ajusta escalas para esboço isométrico (não muda o tamanho da
                         janela)
                     </para>
                 </listitem>
             <varlistentry>
                 <term>square</term>
                 <listitem>
-                    <para>ajusta escalas para esboço isométrico (muda o tamanho da
+                    <para>ajusta escalas para esboço isométrico (muda o tamanho da
                         janela)
                     </para>
                 </listitem>
             <varlistentry>
                 <term>scaling</term>
                 <listitem>
-                    <para>transformação afim de um conjunto de pontos</para>
+                    <para>transformação afim de um conjunto de pontos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>rotate</term>
                 <listitem>
-                    <para>rotação de um conjunto de pontos</para>
+                    <para>rotação de um conjunto de pontos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xsetech</term>
                 <listitem>
-                    <para>ajusta a sub-janela de uma janela de gráficos para
-                        esboço
+                    <para>ajusta a sub-janela de uma janela de gráficos para
+                        esboço
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>subplot</term>
                 <listitem>
-                    <para>divide uma janela de gráficos em uma matriz de
+                    <para>divide uma janela de gráficos em uma matriz de
                         sub-janelas
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xgetech</term>
                 <listitem>
-                    <para>retorna a escala de gráficos corrente</para>
+                    <para>retorna a escala de gráficos corrente</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xchange</term>
                 <listitem>
-                    <para>conversão de coordenadas reais para coordenadas pixeis</para>
+                    <para>conversão de coordenadas reais para coordenadas pixeis</para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <varlistentry>
                 <term>getcolor</term>
                 <listitem>
-                    <para>abre um diálogo que exibe as cores no mapa de cores
+                    <para>abre um diálogo que exibe as cores no mapa de cores
                         corrente
                     </para>
                 </listitem>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Contexto gráfico</title>
+        <title>Contexto gráfico</title>
         <variablelist>
             <varlistentry>
                 <term>xset</term>
                 <listitem>
-                    <para>ajusta valores para o contexto gráfico. Função obsoleta</para>
+                    <para>ajusta valores para o contexto gráfico. Função obsoleta</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xget</term>
                 <listitem>
-                    <para>retorna valores correntes do contexto gráfico.</para>
+                    <para>retorna valores correntes do contexto gráfico.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xlfont</term>
                 <listitem>
-                    <para>carrega uma fonte em um contexto gráfico ou pergunta a fonte
+                    <para>carrega uma fonte em um contexto gráfico ou pergunta a fonte
                         carregada
                     </para>
                 </listitem>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Gravação e carregamento</title>
+        <title>Gravação e carregamento</title>
         <variablelist>
             <varlistentry>
                 <term>xsave</term>
                 <listitem>
-                    <para>salva gráficos em um arquivo</para>
+                    <para>salva gráficos em um arquivo</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xload</term>
                 <listitem>
-                    <para>carrega gráficos salvos</para>
+                    <para>carrega gráficos salvos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xs2gif</term>
                 <listitem>
-                    <para>envia gráficos a um arquivo em sintaxe GIF</para>
+                    <para>envia gráficos a um arquivo em sintaxe GIF</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xs2ppm</term>
                 <listitem>
-                    <para>envia gráficos para um arquivo em sintaxe PPM</para>
+                    <para>envia gráficos para um arquivo em sintaxe PPM</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Primitivas gráficas</title>
+        <title>Primitivas gráficas</title>
         <variablelist>
             <varlistentry>
                 <term>xclear</term>
                 <listitem>
-                    <para>limpa janela de gráficos</para>
+                    <para>limpa janela de gráficos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>driver</term>
                 <listitem>
-                    <para>seleciona um driver gráfico</para>
+                    <para>seleciona um driver gráfico</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xinit</term>
                 <listitem>
-                    <para>inicialização de um driver de gráficos</para>
+                    <para>inicialização de um driver de gráficos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xend</term>
                 <listitem>
-                    <para>termina uma sessão de gráficos</para>
+                    <para>termina uma sessão de gráficos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>replot</term>
                 <listitem>
-                    <para>redesenha a janela de gráficos corrente com novas
+                    <para>redesenha a janela de gráficos corrente com novas
                         fronteiras
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>xpause</term>
-                <listitem>
-                    <para>suspende o Scilab</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>show_window</term>
                 <listitem>
-                    <para>restaura a janela de gráficos corrente</para>
+                    <para>restaura a janela de gráficos corrente</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xdel</term>
                 <listitem>
-                    <para>deleta uma janela de gráficos</para>
+                    <para>deleta uma janela de gráficos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>winsid</term>
                 <listitem>
-                    <para>retorna a lista de janelas de gráficos</para>
+                    <para>retorna a lista de janelas de gráficos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xname</term>
                 <listitem>
-                    <para>muda o nome da janela de gráficos corrente</para>
+                    <para>muda o nome da janela de gráficos corrente</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Posição do mouse</title>
+        <title>Posição do mouse</title>
         <variablelist>
             <varlistentry>
                 <term>xclick</term>
             <varlistentry>
                 <term>locate</term>
                 <listitem>
-                    <para>seleção pelo mouse de um conjunto de pontos</para>
+                    <para>seleção pelo mouse de um conjunto de pontos</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xgetmouse</term>
                 <listitem>
-                    <para>retorna os eventos de mouse e posição corrente</para>
+                    <para>retorna os eventos de mouse e posição corrente</para>
                 </listitem>
             </varlistentry>
         </variablelist>
             <varlistentry>
                 <term>edit_curv</term>
                 <listitem>
-                    <para>editor interativo de curvas gráficas</para>
+                    <para>editor interativo de curvas gráficas</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Funções gráficas e controle automático</title>
+        <title>Funções gráficas e controle automático</title>
         <variablelist>
             <varlistentry>
                 <term>bode</term>
             <varlistentry>
                 <term>gainplot</term>
                 <listitem>
-                    <para>esboço de magnitude</para>
+                    <para>esboço de magnitude</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             <varlistentry>
                 <term>m_circle</term>
                 <listitem>
-                    <para>esboço de um M-círculo</para>
+                    <para>esboço de um M-círculo</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             <varlistentry>
                 <term>evans</term>
                 <listitem>
-                    <para>lugar geométrico das raízes Evans</para>
+                    <para>lugar geométrico das raízes Evans</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>sgrid</term>
                 <listitem>
-                    <para>esboça linhas de grid de um s-plano </para>
+                    <para>esboça linhas de grid de um s-plano </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>plzr</term>
                 <listitem>
-                    <para>esboço de pólo-zero</para>
+                    <para>esboço de pólo-zero</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>zgrid</term>
                 <listitem>
-                    <para>esboço de um z-grid</para>
+                    <para>esboço de um z-grid</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
 </refentry>
+
index af40d91..fe8b688 100644 (file)
         <refpurpose>Converte cores HSV para RGB</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[r,g,b] = hsv2rgb(h,s,v)
             rgb = hsv2rgb(h,s,v)
             [r,g,b] = hsv2rgb(hsv)
             rgb = hsv2rgb(hsv)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>h</term>
@@ -38,7 +38,7 @@
             <varlistentry>
                 <term>s</term>
                 <listitem>
-                    <para>um vetor de tamanho n. Os valores "saturation" (de saturação)
+                    <para>um vetor de tamanho n. Os valores "saturation" (de saturação)
                     </para>
                 </listitem>
             </varlistentry>
@@ -51,7 +51,7 @@
             <varlistentry>
                 <term>hsv</term>
                 <listitem>
-                    <para>uma matriz n x 3. Cada linha contém uma tripla [hue saturation
+                    <para>uma matriz n x 3. Cada linha contém uma tripla [hue saturation
                         value]. 
                     </para>
                 </listitem>
             <varlistentry>
                 <term>rgb</term>
                 <listitem>
-                    <para>uma matriz n x 3. Cada linha contém uma tripla [red green
+                    <para>uma matriz n x 3. Cada linha contém uma tripla [red green
                         blue]. 
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>A função hsv2rgb converte mapas de cores entre os espaços de cores
+    <refsection role="description">
+        <title>Descrição</title>
+        <para>A função hsv2rgb converte mapas de cores entre os espaços de cores
             RGB e HSV. Como a matiz varia de 0 a 1.0 , as cores correspondentes podem
             variar partindo do vermelho entre amarelo, verde, ciano, azul, magenta, e
-            preto, até vermelho novamente, de modo que há na verdade valores de
-            vermelho tanto em 0 quanto em 1.0 . À medida em que a saturação varia de 0
-            a 1.0, as cores correspondentes (matizes) variam de insaturadas (gradações
-            de cinza) a completamente saturadas (nenhum componente branco). à medida
-            em que o valor, ou brilho, varia de 0 a 1.0, as cores correspondentes vão
+            preto, até vermelho novamente, de modo que há na verdade valores de
+            vermelho tanto em 0 quanto em 1.0 . À medida em que a saturação varia de 0
+            a 1.0, as cores correspondentes (matizes) variam de insaturadas (gradações
+            de cinza) a completamente saturadas (nenhum componente branco). à medida
+            em que o valor, ou brilho, varia de 0 a 1.0, as cores correspondentes vão
             se tornando mais brilhantes. 
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[ 
-t=[0:0.3:2*%pi]'; z=sin(t)*cos(t'); 
+t = [0:0.3:2*%pi]'; 
+z = sin(t)*cos(t'); 
 plot3d1(t,t,z) 
-f=gcf();
-for h=0:0.1:1
-  hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
-  f.color_map=hsv2rgb(hsv);
-  xpause(10000)
+f = gcf();
+for h = 0:0.1:1
+  hsv = [h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
+  f.color_map = hsv2rgb(hsv);
+  sleep(10)
 end
-for v=0:0.1:1
-  hsv=[ones(32,1) linspace(0,1,32)' v*ones(32,1)];
-  f.color_map=hsv2rgb(hsv);
-  xpause(10000)
+for v = 0:0.1:1
+  hsv = [ones(32,1) linspace(0,1,32)' v*ones(32,1)];
+  f.color_map = hsv2rgb(hsv);
+  sleep(10)
 end
  ]]></programlisting>
+        <scilab:image>
+            t=[0:0.3:2*%pi]'; z=sin(t)*cos(t');
+            plot3d1(t,t,z)
+            f=gcf();
+            for h=0:0.1:1
+            hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
+            f.color_map=hsv2rgb(hsv);
+            end
+            for v=0:0.1:1
+            hsv=[ones(32,1) linspace(0,1,32)' v*ones(32,1)];
+            f.color_map=hsv2rgb(hsv);
+            end
+        </scilab:image>
     </refsection>
 </refentry>
+
diff --git a/scilab/modules/graphics/help/pt_BR/xpause.xml b/scilab/modules/graphics/help/pt_BR/xpause.xml
deleted file mode 100644 (file)
index fd6685f..0000000
+++ /dev/null
@@ -1,34 +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: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="xpause" xml:lang="en">
-    <refnamediv>
-        <refname>xpause</refname>
-        <refpurpose>suspende o Scilab</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>xpause(microsecs)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            <literal>xpause</literal> suspende o processo corrente pelo número
-            de microssegundos especificados pelo argumento. A suspensão real pode
-            tornar-se mais longa devido a outras atividades do sistema, ou por causa
-            do tempo gasto no processamento da chamada.
-        </para>
-    </refsection>
-</refentry>
index 6fc01d2..c106140 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="xpause">xpause</link>
-                </term>
-                <listitem>
-                    <para>Приостановка работы Scilab'а</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>
                     <link linkend="show_window">show_window</link>
                 </term>
                 <listitem>
         </variablelist>
     </refsection>
 </refentry>
+
diff --git a/scilab/modules/graphics/help/ru_RU/xpause.xml b/scilab/modules/graphics/help/ru_RU/xpause.xml
deleted file mode 100644 (file)
index 62c884d..0000000
+++ /dev/null
@@ -1,60 +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="ru" xml:id="xpause">
-    <refnamediv>
-        <refname>xpause</refname>
-        <refpurpose>приостанавливает Scilab</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>xpause(microsecs)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>microsecs</term>
-                <listitem>
-                    <para>целое число, количество микросекунд.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Функция <function>xpause</function> приостанавливает текущий процесс
-            на количество микросекунд, указанное аргументом <varname>microsecs</varname>.
-            Фактическое время приостановки может быть дольше из-за других процессов
-            в системе, или из-за времени, затраченного на обработку вызова.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-t=[0:0.3:2*%pi]';
-z=sin(t)*cos(t'); 
-plot3d1(t,t,z) 
-f=gcf();
-for h=0:0.1:1
-  hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
-  f.color_map=hsv2rgb(hsv);
-  drawnow()
-  xpause(100000)
-end
- ]]></programlisting>
-    </refsection>
-</refentry>
index f76c2d7..12285f4 100644 (file)
@@ -37,5 +37,6 @@
 x = -25:0.1:25;
 y = x.^2;
 plot2d(x,y);
-if execstr("for k=1:20,xclear(),xpause(1d5),end","errcatch","n") <>0 then bugmes();quit;end
+if execstr("for k=1:20,xclear(),sleep(100),end","errcatch","n") <>0 then bugmes();quit;end
 xdel();
index 304fc61..03ae7f0 100644 (file)
@@ -42,5 +42,6 @@
 x = -25:0.1:25;
 y = x.^2;
 plot2d(x,y);
-if execstr("for k=1:20,xclear(),xpause(1d5),end","errcatch","n") <>0 then pause,end
+if execstr("for k=1:20,xclear(),sleep(100),end","errcatch","n") <>0 then pause,end
 xdel();
+
index 54e4042..1f8f770 100644 (file)
@@ -34,7 +34,7 @@ for y= 0:0.1:1
   E=[e E];
 end
 c=captions(E,string( 0:0.1:1));
-xpause(2d6)
+sleep(2000)
 clf();a=gca();a.axes_visible='on';a.box='on';
 xpoly([0 1],[1 1]/2);
 c=captions(gce(),'test');
@@ -52,10 +52,10 @@ locations=['upper_left','upper_right','lower_right','lower_left'];
 locations=['in_'+locations 'out_'+locations 'lower_caption' 'upper_caption'];
 for l=locations;
   c.legend_location=l;
-  xpause(2d6)
+  sleep(2000)
 end
 c.legend_location='by_coordinates';c.position=[0.5 1/8];
-xpause(2d6) 
+sleep(2000) 
 // captions with paches
 clf();a=gca();
 a.data_bounds=[-1 -1;2 2];a.axes_visible='on';
@@ -75,3 +75,4 @@ end
 E(3).thickness=3;
 c=captions(E,['A' 'B' 'C']);
 c.legend_location='in_upper_right';
index 4da2232..10dee32 100644 (file)
@@ -1,26 +1,26 @@
 // =============================================================================
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - INRIA - Serge Steer 
+// Copyright (C) 2008 - INRIA - Serge Steer
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
 // <-- TEST WITH GRAPHIC -->
 
-clf();a=gca();a.axes_visible='on';
+clf();a=gca();a.axes_visible="on";
 xpoly([0 1],[1 1]/2);
 e1=gce();
-c=captions(e1,'test');
-if or(c.text <> 'test') then pause,end
+c=captions(e1,"test");
+if or(c.text <> "test") then pause,end
 if or(c.links <> e1) then pause,end
-c2=captions(e1,'XXXX');
-if or(c2.text <> 'XXXX') then pause,end
+c2=captions(e1,"XXXX");
+if or(c2.text <> "XXXX") then pause,end
 
-if size(a.children,'*') <>2 then pause,end
+if size(a.children,"*") <>2 then pause,end
 e1.foreground=5;e1.thickness=3;
 xpoly([0 1],0.2+[1 1]/2);
-e2=gce();e2.mark_mode='on';e2.line_mode='off';e2.mark_style=3;
-c=captions([e2,e1],['XXXX';'YYY']);
+e2=gce();e2.mark_mode="on";e2.line_mode="off";e2.mark_style=3;
+c=captions([e2,e1],["XXXX";"YYY"]);
 
 
 if or(c.text <> ["XXXX";"YYY"]) then pause,end
@@ -29,56 +29,56 @@ if or(c.links <> [e2,e1]) then pause,end
 c=captions([],[]);
 if c<>[]  then pause,end
 
-if execstr("captions([e1],[''XXXX'';''YYY''])",'errcatch')==0 then pause,end
-if execstr("captions([e1,e2],[''XXXX''])",'errcatch')==0 then pause,end
+if execstr("captions([e1],[''XXXX'';''YYY''])","errcatch")==0 then pause,end
+if execstr("captions([e1,e2],[''XXXX''])","errcatch")==0 then pause,end
 
-if execstr("captions(e1,[])",'errcatch')==0 then pause,end
+if execstr("captions(e1,[])","errcatch")==0 then pause,end
 
 //following tests should be visual
-clf();a=gca();a.axes_visible='on';a.box='on';a.margins(4)=0.35;
+clf();a=gca();a.axes_visible="on";a.box="on";a.margins(4)=0.35;
 E=[];
 for y= 0:0.1:1
-  xpoly([0 1],[1 1]*y);
-  e=gce();e.foreground=10*y;
-  E=[e E];
+    xpoly([0 1],[1 1]*y);
+    e=gce();e.foreground=10*y;
+    E=[e E];
 end
 c=captions(E,string( 0:0.1:1));
-xpause(2d6)
+sleep(2000)
 
 
-clf();a=gca();a.axes_visible='on';a.box='on';
+clf();a=gca();a.axes_visible="on";a.box="on";
 xpoly([0 1],[1 1]/2);
-c=captions(gce(),'test');
+c=captions(gce(),"test");
 
 
 //test of different possible locations
 clf();f=gcf();
 x=[0:0.1:2*%pi]';
 plot2d(x,[sin(x) sin(2*x) sin(3*x)],[1 -2 3])
-E=get(gce(),'children');
+E=get(gce(),"children");
 E(1).thickness=3;
-E(2).mark_size_unit='point';E(2).mark_size=2;
+E(2).mark_size_unit="point";E(2).mark_size=2;
 
-a=gca();a.box='on';a.margins(2)=0.3;a.margins(1)=0.25;
+a=gca();a.box="on";a.margins(2)=0.3;a.margins(1)=0.25;
 
 
-c=captions(E,['sin(x)' 'sin(2*x)' 'sin(3*x)']);
-c.fill_mode='on';c.background=2;
+c=captions(E,["sin(x)" "sin(2*x)" "sin(3*x)"]);
+c.fill_mode="on";c.background=2;
 
-locations=['upper_left','upper_right','lower_right','lower_left'];
-locations=['in_'+locations 'out_'+locations 'lower_caption' 'upper_caption'];
+locations=["upper_left","upper_right","lower_right","lower_left"];
+locations=["in_"+locations "out_"+locations "lower_caption" "upper_caption"];
 
 for l=locations;
-  c.legend_location=l;
-  xpause(2d6)
+    c.legend_location=l;
+    sleep(2000)
 end
-c.legend_location='by_coordinates';c.position=[0.5 1/8];
-xpause(2d6) 
+c.legend_location="by_coordinates";c.position=[0.5 1/8];
+sleep(2000)
 
 
 // captions with paches
 clf();a=gca();
-a.data_bounds=[-1 -1;2 2];a.axes_visible='on';
+a.data_bounds=[-1 -1;2 2];a.axes_visible="on";
 x=[0:0.1:2*%pi]';
 xpoly(cos(x),sin(x))
 E=gce();
@@ -87,11 +87,12 @@ E=[gce(), E];
 xpoly(1.5+0.1*cos(x),1.5+0.1*sin(x))
 E=[gce(), E];
 for k=1:3
-  E(4-k).foreground=k;
-  E(4-k).background=k+1;
-  E(4-k).fill_mode='on';
-  E(4-k).closed='on';
+    E(4-k).foreground=k;
+    E(4-k).background=k+1;
+    E(4-k).fill_mode="on";
+    E(4-k).closed="on";
 end
 E(3).thickness=3;
-c=captions(E,['A' 'B' 'C']);
-c.legend_location='in_upper_right';
+c=captions(E,["A" "B" "C"]);
+c.legend_location="in_upper_right";
+
index 324aa5f..4f03d83 100644 (file)
@@ -18,8 +18,9 @@ clear;
 clc;
 fig = figure();
 B1 = uicontrol(fig, "style", "pushbutton", "string", "1", ..
-  "position", [50 50 50 20], "callback", "disp(1)");
+"position", [50 50 50 20], "callback", "disp(1)");
 exit_condition = %f;
 while ~exit_condition
-  xpause(1e4)
+    sleep(10)
 end
+
index 3e2d98c..f604b76 100644 (file)
@@ -37,7 +37,7 @@ pause
                 </td>
                 <td>
                     <programlisting role="example"><![CDATA[
-xpause - halt
+sleep - halt
 ]]></programlisting>
                 </td>
             </tr>
@@ -46,7 +46,7 @@ xpause - halt
     <refsection>
         <title>Particular cases</title>
         <para>
-            Scilab equivalent for Matlab <emphasis role="bold">pause(n)</emphasis> is <emphasis role="bold">xpause(1000*n)</emphasis>.
+            Scilab equivalent for Matlab <emphasis role="bold">pause(n)</emphasis> is <emphasis role="bold">sleep(n)</emphasis>.
         </para>
         <variablelist>
             <varlistentry>
@@ -68,3 +68,4 @@ xpause - halt
         </variablelist>
     </refsection>
 </refentry>
+
index ed6f9f9..49793bf 100644 (file)
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-function [tree]=sci_pause(tree)
+function [tree] = sci_pause(tree)
     // M2SCI function
     // Conversion function for Matlab pause
     // Input: tree = Matlab funcall tree
     // Ouput: tree = Scilab equivalent for tree
 
     if rhs<1 then
-        tree.name="halt"
+        tree.name = "halt"
     else
         n = getrhs(tree)
         if n.vtype==String then // pause on/off
             no_equiv(expression2code(tree));
         else
-            tree.rhs=Rhs_tlist(Operation("*",list(Cste(1000),n),list()))
-            tree.name="xpause"
+            tree.name = "sleep"
         end
     end
 
 endfunction
+
index c983e3b..34ecb5a 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ * Copyright (C) 2016 - Samuel GOUGEON
  * 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: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="sleep">
     <refnamediv>
         <refname>sleep</refname>
-        <refpurpose>suspend Scilab</refpurpose>
+        <refpurpose>suspend all code executions (console, scripts, callbacks,..)</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>sleep(milliseconds)</synopsis>
+        <synopsis>
+            sleep(milliseconds)
+            sleep(seconds, "s")
+        </synopsis>
     </refsynopsisdiv>
+    <refsection role="arguments">
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>milliseconds</term>
+                <listitem>duration of the sleep, in milliseconds (decimal number)
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>seconds</term>
+                <listitem>duration of the sleep, in seconds (decimal number)
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>sleep</literal> : Sleep process for specified number of miliseconds
-            specified by the argument. The actual suspension time may be longer
-            because of other activities in the system, or because of the time spent in
-            processing the call.
+            <function>sleep</function> stops Scilab processing any instruction for
+            a specified number of miliseconds or seconds:
+            <para>
+                <variablelist>
+                    <varlistentry>
+                        <term>Console:</term>
+                        <listitem> input and output in console are suspended.
+                            <warning>The CTRL-C interruption is caught but performed only at
+                                the end of the sleep.
+                            </warning>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Scripts and functions:</term>
+                        <listitem>
+                            When <function>sleep(..)</function>
+                            is called inside a script or a function, Scilab waits for the
+                            given duration before processing the next instruction.
+                            CTRL-C in the console is caught but performed only at the end of
+                            the sleep.
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>callbacks:</term>
+                        <listitem> .. are actions triggered by interactions
+                            with menus and with <literal>uicontrol</literal> interactive
+                            graphical components. During the sleep(..), these interactions
+                            are caught, and related instructions are buffered.
+                            Buffered actions are all performed after sleep()'s end.
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Graphics interactions:</term>
+                        <listitem>
+                            <function>sleep(..)</function>
+                            does not prevent interacting with graphics, providing that the
+                            interaction mode has been turned on before entering the sleep.
+                            Then, moving curves, editing graphics labels, etc is still
+                            possible during Scilab's sleep. The wake-up does not reset these
+                            actions.
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+            </para>
+            <note>Time resolution:
+                <simplelist>
+                    <member>Windows systems: 0.5 ms</member>
+                    <member>Linux systems: 1 µs</member>
+                </simplelist>
+            </note>
+            <warning>Time resolution is not.. time accuracy: The actual suspension
+                time may be longer than the specified one, due to other processes run
+                in the system, or due to the time spent to process the call.
+            </warning>
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-tic;sleep(6000);toc
+        <programlisting role="example"><![CDATA[
+// Simple examples
+tic; sleep(4350); toc
+tic; sleep(4.35, "s"); toc
+
+// Testing the sleep's accuracy:
+results = [];
+disp("Please wait... sleep()s and wake-up are performed...")
+for i = -1:4
+    dt = 10^i;        // specified duration [ms]
+    tic;
+    sleep(dt);
+    dta = toc()*1000; // actual duration [ms]
+    results = [results ; dt dta ];
+end
+results
+
+// Test of the CTRL-C interruption:
+disp("Press CTRL + C keys now: the 15 s sleep is going on")
+sleep(15,"s")
+
+// Test of interactions with menus:
+clf
+plot2d()
+// [If you are a MacOS user, select the menu "Edit=> Clear figure" instead]
+mprintf("During this 30s sleep, click on the figure\n  then on its menu ""Edit => Figure properties""")
+// The graphical editor will be actually called only at wake-up
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="xpause">xpause</link>
+                <link linkend="pause">pause</link>
             </member>
             <member>
-                <link linkend="pause">pause</link>
+                <link linkend="halt">halt</link>
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            The fractional part of <varname>milliseconds</varname>
+                            is now accepted and processed (replace xpause(microseconds)).
+                        </listitem>
+                        <listitem>Syntax sleep(seconds, "s") added.
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
+
index d476045..db8a761 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
+ * Copyright (C) INRIA -
+ * Copyright (C) 2016 - Samuel GOUGEON
  * 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: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="sleep">
     <refnamediv>
         <refname>sleep</refname>
-        <refpurpose>suspend Scilab</refpurpose>
+        <refpurpose>mise en sommeil de l'interprêteur (console, scripts, callbacks)</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>sleep(milliseconds)</synopsis>
+        <title>Syntaxe</title>
+        <synopsis>
+            sleep(milliseconds)
+            sleep(seconds, "s")
+        </synopsis>
     </refsynopsisdiv>
+    <refsection role="arguments">
+        <title>Paramètres</title>
+        <variablelist>
+            <varlistentry>
+                <term>milliseconds</term>
+                <listitem>Durée du sommeil, en millisecondes (nombre décimal)
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>seconds</term>
+                <listitem>Durée du sommeil, en secondes (nombre décimal)
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>sleep</literal>Sleep suspend Scilab durant la durée specifiée en
-            millisecondes.
+            <literal>sleep</literal> arrête l'exécution des instructions Scilab
+            et attend la durée spécifiée, sans rien faire (ou presque):
+            <variablelist>
+                <varlistentry>
+                    <term>Console :</term>
+                    <listitem> les entrées et affichages sont suspendus.
+                        <warning>L'interruption avec CTRL-C est prise en compte mais
+                            est exécutée uniquement au terme de la période de sommeil
+                            programmée.
+                        </warning>
+                    </listitem>
+                </varlistentry>
+                <varlistentry>
+                    <term>Scripts et functions :</term>
+                    <listitem>
+                         lorsque <function>sleep(..)</function>
+                        est appelée depuis un script ou une function, Scilab attend
+                        la durée indiquée avant d'exécuter la ligne d'instruction suivante
+                        dans le script ou la function. Pendant ce temps, la console
+                        est bloquée. L'interruption CTRL-C est prise en compte mais
+                        exécutée uniquement au terme du sommeil programmé.
+                    </listitem>
+                </varlistentry>
+                <varlistentry>
+                    <term>callbacks :</term>
+                    <listitem> .. ce sont les actions programmées à exécuter
+                        lorsqu'on interagit avec les menus et les composants graphiques
+                        interactifs <literal>uicontrol</literal>. Durant le sommeil
+                        provoqué par sleep(..), les interactions avec les menus et les
+                        <literal>uicontrol</literal> sont possibles : les
+                        instructions/actions associées sont prises en compte et mémorises,
+                        mais leur exécution est différée au terme du sommeil.
+                    </listitem>
+                </varlistentry>
+                <varlistentry>
+                    <term>Interactions graphiques :</term>
+                    <listitem>
+                        <function>sleep(..)</function>
+                        n'empêche pas les interactions avec les graphiques (courbes,
+                        titres,...), pour peu que le mode graphique interactif soit activé
+                        avant la mise en sommeil.
+                        Il est alors possible de déplacer les courbes, de modifier les
+                        titres des axes, ou d'éditer les points d'une courbe (si cela a
+                        été activé). Le réveil ne remet pas en cause le résultat de ces
+                        actions.
+                    </listitem>
+                </varlistentry>
+            </variablelist>
+            <note>Résolution temporelle :
+                <simplelist>
+                    <member>Sous Windows : 0.5 ms</member>
+                    <member>Sous Linux : 1 µs</member>
+                </simplelist>
+            </note>
+            <warning>Résolution... n'est pas justesse : la durée réelle du sommeil
+                peut s'avérer différente de la durée spécifiée, en particulier en
+                fonction de la charge du processeur ou du temps mis par Scilab pour
+                déclencher <function>sleep()</function>. Voir le test en exemple.
+            </warning>
         </para>
     </refsection>
     <refsection>
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-tic;sleep(6000);toc
+        <programlisting role="example"><![CDATA[
+// Exemples simples
+tic; sleep(4350); toc
+tic; sleep(4.35, "s"); toc
+
+// Comparaison entre les durées de sommeil programmée et réelle
+results = [];
+disp("SVP patienter... sleep()s et des réveils sont en cours...")
+for i = -1:4
+    dt = 10^i;        // durée spécifiée [ms]
+    tic;
+    sleep(dt);
+    dta = toc()*1000; // durée réelle mesurée [ms]
+    results = [results ; dt dta ];
+end
+results
+
+// Test d'interruption avec CTRL-C :
+mprintf("Presser les touches CTRL + C maintenant\n  => pas d''effet : sommeil de 15 s en cours...")
+sleep(15, "s")
+
+// Interactions avec les menus : test
+clf
+plot2d()
+// [Si vous êtes utilisateur MacOS, choisir le menu "Editer => Effacer la figure"]
+mprintf("Pendant ce sommeil de 30s, cliquer sur la fenêtre graphique,\n   puis menu Editer => Propriétés de la Figure")
+// L'éditeur de propriétés graphiques sera appelé uniquement au réveil de Scilab
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="xpause">xpause</link>
+                <link linkend="pause">pause</link>
             </member>
             <member>
-                <link linkend="pause">pause</link>
+                <link linkend="halt">halt</link>
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>Les fractions de millisecondes sont maintenant
+                            acceptées et prises en compte (remplace xpause(microsecondes)).
+                        </listitem>
+                        <listitem>Syntaxe sleep(secondes,"s") ajoutée.
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
+
diff --git a/scilab/modules/time/help/ja_JP/sleep.xml b/scilab/modules/time/help/ja_JP/sleep.xml
deleted file mode 100644 (file)
index 1afb24b..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="sleep">
-    <refnamediv>
-        <refname>sleep</refname>
-        <refpurpose>Scilabを停止(サスペンド)する</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>sleep(milliseconds)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>説明</title>
-        <para>
-            <literal>sleep</literal> : 
-            引数で指定したミリ秒の間処理を停止します.
-            他のシステムの処理または
-            呼び出し処理の時間により,実際に停止される時間は
-            長くなる可能性があります.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-tic;sleep(6000);toc
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="xpause">xpause</link>
-            </member>
-            <member>
-                <link linkend="pause">pause</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 47cd705..345aabe 100644 (file)
 int sci_sleep(char *fname, void* pvApiCtx)
 {
     SciErr sciErr;
-    int m1 = 0, n1 = 0, sec = 0;
+    int m1 = 0, n1 = 0 , iRows = 0, iCols = 0, option = 0;
+    double sec = 0;
+    char * opt = NULL;
     int * p1_in_address = NULL;
+    int * p2_in_address = NULL;
     double * pDblReal = NULL;
 
+
     CheckLhs(0, 1);
-    CheckRhs(1, 1);
+    CheckRhs(1, 2);
 
-    if (Rhs == 1)
+    if (Rhs >= 1)
     {
         sciErr = getVarAddressFromPosition(pvApiCtx, 1, &p1_in_address);
         sciErr = getMatrixOfDouble(pvApiCtx, p1_in_address, &m1, &n1, &pDblReal);
@@ -47,17 +51,41 @@ int sci_sleep(char *fname, void* pvApiCtx)
             Scierror(999, _("%s: Wrong type for input argument #%d: A real scalar expected.\n"), fname, 1);
             return 0;
         }
+        sec = (double)  * pDblReal;
 
-        sec = (int)  * pDblReal;
         if (sec <= 0)
         {
             Scierror(999, _("%s: Wrong values for input argument #%d: Non-negative integers expected.\n"), fname, 1);
             return 0;
         }
 
+        if (Rhs == 2)
+        {
+            sciErr = getVarAddressFromPosition(pvApiCtx, 2, &p2_in_address);
+            getAllocatedSingleString(pvApiCtx, p2_in_address, &opt);
+
+            if (strcmp("s", opt) != 0)
+            {
+                Scierror(999, _("%s: Wrong value for input argument #%d: 's' expected.\n"), fname, 2);
+                return 0;
+            }
+            if (strcmp("s", opt) == 0)
+            {
+                option = 1;
+            }
+        }
+
+
 #ifdef _MSC_VER
         {
-            int ms = (sec); /** time is specified in milliseconds in scilab**/
+            if (option == 1)
+            {
+                double ms = sec * 1000; /* convert seconds into milliseconds */
+            }
+            else
+            {
+                double ms = sec;
+            }
             if (ms > 0)
             {
                 Sleep(ms);    /* Number of milliseconds to sleep. */
@@ -67,6 +95,10 @@ int sci_sleep(char *fname, void* pvApiCtx)
         {
             unsigned useconds;
             useconds = (unsigned) sec;
+            if (option == 1)
+            {
+                useconds = useconds * 1000;
+            }
             if (useconds != 0)
 #ifdef HAVE_USLEEP
             {
@@ -82,10 +114,10 @@ int sci_sleep(char *fname, void* pvApiCtx)
         }
 #endif
     }
-
     LhsVar(1) = 0;
     PutLhsVar();
 
     return 0;
 }
 /*--------------------------------------------------------------------------*/
+
index 122d261..824bcfb 100644 (file)
 /*--------------------------------------------------------------------------*/
 int sci_xpause(char *fname, void* pvApiCtx)
 {
+
+    sciprint(_("%s: Feature %s is obsolete and will be permanently removed in Scilab %s\n"), _("Warning"), fname, "6.1");
+    sciprint(_("%s: Please use %s instead.\n"), _("Warning"), "sleep()");
+
     SciErr sciErr;
     int m1 = 0, n1 = 0, sec = 0;
     int * p1_in_address = NULL;
@@ -86,6 +90,6 @@ int sci_xpause(char *fname, void* pvApiCtx)
     PutLhsVar();
 
     return 0;
-
 }
 /*--------------------------------------------------------------------------*/
+