* plot2d1() removal 42/9942/12
Sylvestre Ledru [Thu, 6 Dec 2012 16:25:13 +0000 (17:25 +0100)]
Change-Id: I58e5e736f1c885120367c0383a7cb5308febab0c

62 files changed:
scilab/CHANGES
scilab/modules/cacsd/help/en_US/arl2.xml
scilab/modules/cacsd/help/en_US/formal_representation/frep2tf.xml
scilab/modules/cacsd/help/en_US/plot_display/svplot.xml
scilab/modules/cacsd/help/ja_JP/arl2.xml
scilab/modules/cacsd/help/ja_JP/formal_representation/frep2tf.xml
scilab/modules/cacsd/help/ja_JP/plot_display/svplot.xml
scilab/modules/differential_equations/demos/ode/ode_chstiff/ode_chstiff.dem.sce
scilab/modules/differential_equations/help/en_US/odedc.xml
scilab/modules/differential_equations/help/ja_JP/odedc.xml
scilab/modules/differential_equations/help/pt_BR/odedc.xml
scilab/modules/differential_equations/help/ru_RU/odedc.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/squarewave.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/squarewave.xml
scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/squarewave.xml
scilab/modules/elementary_functions/help/pt_BR/elementarymatrices/squarewave.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/squarewave.xml
scilab/modules/graphics/demos/2d_3d_plots/2d_3d_plots.dem.gateway.sce
scilab/modules/graphics/demos/2d_3d_plots/plot2d1_1.dem.sce [deleted file]
scilab/modules/graphics/demos/2d_3d_plots/plot2d1_2.dem.sce [deleted file]
scilab/modules/graphics/help/en_US/2d_plot/plot2d.xml
scilab/modules/graphics/help/en_US/2d_plot/plot2d1.xml [deleted file]
scilab/modules/graphics/help/en_US/2d_plot/plot2d3.xml
scilab/modules/graphics/help/en_US/2d_plot/plot2d4.xml
scilab/modules/graphics/help/en_US/axes_operations/graduate.xml
scilab/modules/graphics/help/en_US/axes_operations/plotframe.xml
scilab/modules/graphics/help/en_US/figure_operations/drawlater.xml
scilab/modules/graphics/help/fr_FR/axes_operations/graduate.xml
scilab/modules/graphics/help/ja_JP/2d_plot/plot2d.xml
scilab/modules/graphics/help/ja_JP/2d_plot/plot2d1.xml [deleted file]
scilab/modules/graphics/help/ja_JP/2d_plot/plot2d3.xml
scilab/modules/graphics/help/ja_JP/2d_plot/plot2d4.xml
scilab/modules/graphics/help/ja_JP/axes_operations/graduate.xml
scilab/modules/graphics/help/ja_JP/axes_operations/plotframe.xml
scilab/modules/graphics/help/ja_JP/figure_operations/drawlater.xml
scilab/modules/graphics/help/pt_BR/2d_plot/plot2d.xml
scilab/modules/graphics/help/pt_BR/2d_plot/plot2d1.xml [deleted file]
scilab/modules/graphics/help/pt_BR/2d_plot/plot2d3.xml
scilab/modules/graphics/help/pt_BR/2d_plot/plot2d4.xml
scilab/modules/graphics/help/pt_BR/axes_operations/graduate.xml
scilab/modules/graphics/help/pt_BR/axes_operations/plotframe.xml
scilab/modules/graphics/help/pt_BR/figure_operations/drawlater.xml
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/macros/%_plot2d1.sci [deleted file]
scilab/modules/graphics/macros/graduate.sci
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.cpp
scilab/modules/graphics/sci_gateway/graphics_gateway.xml
scilab/modules/graphics/tests/unit_tests/plot2d1.dia.ref
scilab/modules/graphics/tests/unit_tests/plot2d1.tst
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/data/configuration/scilab_primitives.txt
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/plot2d1_1.png [deleted file]
scilab/modules/helptools/images/plot2d1_2.png [deleted file]
scilab/modules/helptools/images/plot2d1_3.png [deleted file]
scilab/modules/integer/macros/%i_plot2d1.sci [deleted file]
scilab/modules/randlib/demos/binomial.dem.sce
scilab/modules/randlib/demos/discrete.dem.sce
scilab/modules/randlib/demos/discrete_uni.dem.sce
scilab/modules/randlib/demos/geometric.dem.sce
scilab/modules/randlib/demos/poisson.dem.sce

index df8328d..080d742 100644 (file)
@@ -270,8 +270,6 @@ Obsolete functions or features
 ==============================
 * maxfiles function is now obsolete.
 
-* xpause will be removed from Scilab 6.1. Please use sleep(..) instead.
-
 * isoview(xmin,xmax,ymin,ymax) will be removed from Scilab 6.1. Please use isoview("on"), replot(..) instead.
 
 
@@ -287,10 +285,14 @@ Removed Functions
 
 * extract_help_examples has been removed. (Undocumented and based on former help format).
 
+* xpause has been removed. Please use sleep(..) instead.
+
 * xclear has been removed. Please use clf instead.
 
 * fcontour2d has been removed. Please use contour2d instead.
 
+* plot2d1 has been removed. Please use plot2d() instead.
+
 * Symbolic module functions have been removed:
   - addf
   - cmb_lin
index 66a720e..a0d0edf 100644 (file)
@@ -26,7 +26,7 @@
             [den,num,err]=arl2(y,den0,n [,imp],'all')
         </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>
             <literal>[den,num,err]=arl2(y,den0,n [,imp]) </literal> finds a pair of polynomials
             <literal>[den,num,err]=arl2(y,den0,n [,imp],'all') </literal>  returns in the
             vectors of polynomials <literal>num</literal> and <literal>den</literal>  a set of local
             optimums for the problem. The solutions are sorted with increasing
-            errors <literal>err</literal>. In this case <literal>den0</literal> is already assumed to be 
+            errors <literal>err</literal>. In this case <literal>den0</literal> is already assumed to be
             <literal>poly(1,'z','c')</literal>
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-v=ones(1,20);
+        <programlisting role="example"><![CDATA[
+v = ones(1,20);
 clf();
-plot2d1('enn',0,[v';zeros(80,1)],2,'051',' ',[1,-0.5,100,1.5])
+plot2d([], [v';zeros(80,1)], 2, '051',' ',[1,-0.5,100,1.5])
 
-[d,n,e]=arl2(v,poly(1,'z','c'),1)
-plot2d1('enn',0,ldiv(n,d,100),2,'000')
-[d,n,e]=arl2(v,d,3)
-plot2d1('enn',0,ldiv(n,d,100),3,'000')
-[d,n,e]=arl2(v,d,8)
-plot2d1('enn',0,ldiv(n,d,100),5,'000')
+[d,n,e] = arl2(v, poly(1,'z','c'),1)
+plot2d([], ldiv(n,d,100), 2, '000')
+[d,n,e] = arl2(v,d,3)
+plot2d([], ldiv(n,d,100), 3, '000')
+[d,n,e] = arl2(v,d,8)
+plot2d([], ldiv(n,d,100), 5, '000')
 
 [d,n,e]=arl2(v,poly(1,'z','c'),4,'all')
-plot2d1('enn',0,ldiv(n(1),d(1),100),10,'000')
+plot2d([], ldiv(n(1),d(1),100), 10, '000')
  ]]></programlisting>
         <scilab:image>
-            v=ones(1,20);
-            plot2d1('enn',0,[v';zeros(80,1)],2,'051',' ',[1,-0.5,100,1.5])
-            
-            [d,n,e]=arl2(v,poly(1,'z','c'),1)
-            plot2d1('enn',0,ldiv(n,d,100),2,'000')
-            [d,n,e]=arl2(v,d,3)
-            plot2d1('enn',0,ldiv(n,d,100),3,'000')
-            [d,n,e]=arl2(v,d,8)
-            plot2d1('enn',0,ldiv(n,d,100),5,'000')
-            
-            [d,n,e]=arl2(v,poly(1,'z','c'),4,'all')
-            plot2d1('enn',0,ldiv(n(1),d(1),100),10,'000')
+          v = ones(1,20);
+          plot2d([], [v';zeros(80,1)], 2, '051',' ',[1,-0.5,100,1.5])
+
+          [d,n,e] = arl2(v, poly(1,'z','c'),1)
+          plot2d([], ldiv(n,d,100), 2, '000')
+          [d,n,e] = arl2(v,d,3)
+          plot2d([], ldiv(n,d,100), 3, '000')
+          [d,n,e] = arl2(v,d,8)
+          plot2d([], ldiv(n,d,100), 5, '000')
+
+          [d,n,e]=arl2(v,poly(1,'z','c'),4,'all')
+          plot2d([], ldiv(n(1),d(1),100), 10, '000')
         </scilab:image>
-        
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
index 3091dd9..fbddfa5 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) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -22,7 +22,7 @@
         <title>Syntax</title>
         <synopsis>[h [,err]]=frep2tf(frq,repf,dg [,dom,tols,weight])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             Frequency response to  transfer function conversion. The order of <literal>h</literal>
             is a priori given in <literal>dg</literal> which must be provided.
             The following linear system is solved in the least square sense.
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
  weight(k)*(n( phi_k) - d(phi_k)*rep_k)=0, k=1,..,n
  ]]></programlisting>
         <para>
-            where <literal>phi_k= 2*%i*%pi*frq</literal> when <literal>dom='c'</literal> and <literal>phi_k=exp(2*%i*%pi*dom*frq</literal> if not. If the <literal>weight</literal> vector is not given a default 
+            where <literal>phi_k= 2*%i*%pi*frq</literal> when <literal>dom='c'</literal> and
+            <literal>phi_k=exp(2*%i*%pi*dom*frq</literal> if not. If the <literal>weight</literal>
+            vector is not given a default
             penalization is used (when <literal>dom='c'</literal>).
         </para>
         <para>
             A stable and minimum phase system can be obtained by using function <literal>factors</literal>.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 s=poly(0,'s');
 h=syslin('c',(s-1)/(s^3+5*s+20))
 frq=0:0.05:3;
 repf=repfreq(h,frq);
 clean(frep2tf(frq,repf,3))
  ]]></programlisting>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 
 Sys=ssrand(1,1,10);
 frq=logspace(-3,2,200);
@@ -122,27 +124,26 @@ bode(frq,[rep;rep2])   //Responses of Sys and Sys2
 [gsort(spec(Sys('A'))), gsort(roots(Sys2('den')))] //poles
  ]]></programlisting>
         <scilab:image>
-            
             Sys=ssrand(1,1,10);
             frq=logspace(-3,2,200);
-            [frq,rep]=repfreq(Sys,frq); 
+            [frq,rep]=repfreq(Sys,frq);
             [Sys2,err]=frep2tf(frq,rep,10);
             Sys2=clean(Sys2)
-            
+
             [frq,rep2]=repfreq(Sys2,frq);
             bode(frq,[rep;rep2])
             [gsort(spec(Sys('A'))), gsort(roots(Sys2('den')))]
         </scilab:image>
-        <programlisting role="example"><![CDATA[ 
-dom=1/1000; // Sampling time 
-z=poly(0,'z');
-h=syslin(dom,(z^2+0.5)/(z^3+0.1*z^2-0.5*z+0.08))
-frq=(0:0.01:0.5)/dom;
-repf=repfreq(h,frq);
-[Sys2,err]=frep2tf(frq,repf,3,dom);
-[frq,rep2]=repfreq(Sys2,frq); //Frequency response of Sys2
+        <programlisting role="example"><![CDATA[
+dom = 1/1000; // Sampling time
+z = poly(0,'z');
+h = syslin(dom,(z^2+0.5)/(z^3+0.1*z^2-0.5*z+0.08))
+frq = (0:0.01:0.5)/dom;
+repf = repfreq(h,frq);
+[Sys2,err] = frep2tf(frq,repf,3,dom);
+[frq,rep2] = repfreq(Sys2,frq); //Frequency response of Sys2
 clf();
-plot2d1("onn",frq',abs([repf;rep2])');
+plot2d(frq, abs([repf;rep2])')
  ]]></programlisting>
         <scilab:image>
             dom=1/1000;
@@ -152,7 +153,7 @@ plot2d1("onn",frq',abs([repf;rep2])');
             repf=repfreq(h,frq);
             [Sys2,err]=frep2tf(frq,repf,3,dom);
             [frq,rep2]=repfreq(Sys2,frq);
-            plot2d1("onn",frq',abs([repf;rep2])');
+            plot2d(frq, abs([repf;rep2])')
         </scilab:image>
     </refsection>
     <refsection role="see also">
index 08b07cd..bb7b291 100644 (file)
@@ -22,7 +22,7 @@
         <title>Syntax</title>
         <synopsis>[SVM]=svplot(sl,[w])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
@@ -41,7 +41,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             computes for the system <literal>sl=(A,B,C,D)</literal>
@@ -67,32 +67,34 @@ or
             The <literal>i</literal>-th column of the output matrix <literal>SVM</literal> contains the singular
             values of <literal>G</literal> for the <literal>i</literal>-th frequency value <literal>w(i)</literal>.
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 SVM = svplot(sl)
  ]]></programlisting>
         <para>
             is equivalent to
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 SVM = svplot(sl,logspace(-3,3))  (continuous)
  ]]></programlisting>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 SVM = svplot(sl,logspace(-3,%pi)) (discrete)
  ]]></programlisting>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-x=logspace(-3,3);
-y=svplot(ssrand(2,2,4),x);
-clf();plot2d1("oln",x',20*log(y')/log(10));
+        <programlisting role="example"><![CDATA[
+x = logspace(-3,3);
+y = svplot(ssrand(2,2,4),x);
+clf()
+plot2d("ln", x, 20*log(y')/log(10))
 xgrid(12)
 xtitle("Singular values plot","(Rd/sec)", "Db");
  ]]></programlisting>
         <scilab:image>
             x=logspace(-3,3);
             y=svplot(ssrand(2,2,4),x);
-            clf();plot2d1("oln",x',20*log(y')/log(10));
+            clf()
+            plot2d("ln", x, 20*log(y')/log(10))
             xgrid(12)
             xtitle("Singular values plot","(Rd/sec)", "Db");
         </scilab:image>
index f4ababe..0ae9c81 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) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
             [den,num,err]=arl2(y,den0,n [,imp],'all')
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>引数</title>
         <variablelist>
             <varlistentry>
                 <term>y</term>
                 <listitem>
                     <para>
-                        <literal>z^-1</literal>の実数ベクトルまたは多項式で, 
+                        <literal>z^-1</literal>の実数ベクトルまたは多項式で,
                         有理数システムの(インパルス応答の)フーリエ級数近似の係数を有します.
                     </para>
                 </listitem>
@@ -90,7 +90,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>説明</title>
         <para>
             <literal>[den,num,err]=arl2(y,den0,n [,imp]) </literal> は,
             <literal>poly(1,'z','c')</literal>であると仮定されます.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-v=ones(1,20);
+        <programlisting role="example"><![CDATA[
+v = ones(1,20);
 clf();
-plot2d1('enn',0,[v';zeros(80,1)],2,'051',' ',[1,-0.5,100,1.5])
-[d,n,e]=arl2(v,poly(1,'z','c'),1)
-plot2d1('enn',0,ldiv(n,d,100),2,'000')
-[d,n,e]=arl2(v,d,3)
-plot2d1('enn',0,ldiv(n,d,100),3,'000')
-[d,n,e]=arl2(v,d,8)
-plot2d1('enn',0,ldiv(n,d,100),5,'000')
-[d,n,e]=arl2(v,poly(1,'z','c'),4,'all')
-plot2d1('enn',0,ldiv(n(1),d(1),100),10,'000')
+plot2d([], [v';zeros(80,1)], 2, '051',' ',[1,-0.5,100,1.5])
+
+[d,n,e] = arl2(v, poly(1,'z','c'),1)
+plot2d([], ldiv(n,d,100), 2, '000')
+[d,n,e] = arl2(v,d,3)
+plot2d([], ldiv(n,d,100), 3, '000')
+[d,n,e] = arl2(v,d,8)
+plot2d([], ldiv(n,d,100), 5, '000')
+
+[d,n,e] = arl2(v,poly(1,'z','c'),4,'all')
+plot2d([], ldiv(n(1),d(1),100), 10, '000')
  ]]></programlisting>
         <scilab:image>
-            v=ones(1,20);
-            plot2d1('enn',0,[v';zeros(80,1)],2,'051',' ',[1,-0.5,100,1.5])
-            [d,n,e]=arl2(v,poly(1,'z','c'),1)
-            plot2d1('enn',0,ldiv(n,d,100),2,'000')
-            [d,n,e]=arl2(v,d,3)
-            plot2d1('enn',0,ldiv(n,d,100),3,'000')
-            [d,n,e]=arl2(v,d,8)
-            plot2d1('enn',0,ldiv(n,d,100),5,'000')
-            [d,n,e]=arl2(v,poly(1,'z','c'),4,'all')
-            plot2d1('enn',0,ldiv(n(1),d(1),100),10,'000')
+          v = ones(1,20);
+          plot2d([], [v';zeros(80,1)], 2, '051',' ',[1,-0.5,100,1.5])
+
+          [d,n,e] = arl2(v, poly(1,'z','c'),1)
+          plot2d([], ldiv(n,d,100), 2, '000')
+          [d,n,e] = arl2(v,d,3)
+          plot2d([], ldiv(n,d,100), 3, '000')
+          [d,n,e] = arl2(v,d,8)
+          plot2d([], ldiv(n,d,100), 5, '000')
+
+          [d,n,e] = arl2(v,poly(1,'z','c'),4,'all')
+          plot2d([], ldiv(n(1),d(1),100), 10, '000')
         </scilab:image>
     </refsection>
     <refsection role="see also">
index 4185ed6..a2cc6c2 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) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -24,7 +24,7 @@
         <title>呼び出し手順</title>
         <synopsis>[h [,err]]=frep2tf(frq,repf,dg [,dom,tols,weight])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>パラメータ</title>
         <variablelist>
             <varlistentry>
@@ -85,7 +85,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>説明</title>
         <para>
             周波数応答を伝達関数に変換します.
@@ -93,7 +93,7 @@
             <literal>dg</literal>で事前に指定されます.
             以下の線形システムが最小二乗解として解かれます.
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role=""><![CDATA[
  weight(k)*(n( phi_k) - d(phi_k)*rep_k)=0, k=1,..,n
  ]]></programlisting>
         <para>
             得られます.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 s=poly(0,'s');
 h=syslin('c',(s-1)/(s^3+5*s+20))
 frq=0:0.05:3;repf=repfreq(h,frq);
 clean(frep2tf(frq,repf,3))
-Sys=ssrand(1,1,10); 
+Sys=ssrand(1,1,10);
 frq=logspace(-3,2,200);
 [frq,rep]=repfreq(Sys,frq);  //Sysの周波数応答
 [Sys2,err]=frep2tf(frq,rep,10);Sys2=clean(Sys2)//Sysの周波数応答からSys2を得る
@@ -128,7 +128,8 @@ h=syslin(dom,(z^2+0.5)/(z^3+0.1*z^2-0.5*z+0.08))
 frq=(0:0.01:0.5)/dom;repf=repfreq(h,frq);
 [Sys2,err]=frep2tf(frq,repf,3,dom);
 [frq,rep2]=repfreq(Sys2,frq); //Sys2の周波数応答
-clf();plot2d1("onn",frq',abs([repf;rep2])');
+clf()
+plot2d(frq, abs([repf;rep2])')
 ]]></programlisting>
     </refsection>
     <refsection role="see also">
index f2d0fe4..d119f16 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - F.D
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -22,7 +22,7 @@
         <title>呼び出し手順</title>
         <synopsis>[SVM]=svplot(sl,[w])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>パラメータ</title>
         <variablelist>
             <varlistentry>
@@ -41,7 +41,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>説明</title>
         <para>
             システム <literal>sl=(A,B,C,D)</literal>の伝達関数行列の特異値を計算します:
@@ -68,27 +68,28 @@ or
             <literal>i</literal>番目の周波数<literal>w(i)</literal>に関する
             <literal>G</literal> の特異値が含まれます.
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 SVM = svplot(sl)
  ]]></programlisting>
         <para>
             は以下と等価です
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 SVM = svplot(sl,logspace(-3,3))  (連続系)
  ]]></programlisting>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 SVM = svplot(sl,logspace(-3,%pi)) (離散系)
  ]]></programlisting>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-x=logspace(-3,3);
-y=svplot(ssrand(2,2,4),x);
-clf();plot2d1("oln",x',20*log(y')/log(10));
+        <programlisting role="example"><![CDATA[
+x = logspace(-3,3);
+y = svplot(ssrand(2,2,4),x);
+clf()
+plot2d("ln", x, 20*log(y')/log(10))
 xgrid(12)
-xtitle("Singular values plot","(Rd/sec)", "Db");
+xtitle("Singular values plot","(Rd/sec)", "Db")
  ]]></programlisting>
     </refsection>
 </refentry>
index 3d714a5..f73491e 100644 (file)
@@ -49,7 +49,7 @@ function demo_ode_chstiff()
 
         // Visualisation
         //write(%io(2),[rd(1);y(:,ny)]','(''t='',e10.3,'' y='',3(e10.3,'',''))');
-        plot2d1("oln",rd(1)',(diag([1 10000 1])*y(:,ny))',style=[-3,-3,-3]);
+        plot2d("ln", rd(1), (diag([1 10000 1])*y(:,ny))',style=[-3,-3,-3]);
 
         // Next root
         [y,rd,w,iw]=ode("root",[1;0;0],rd(1),t(k+1:nt),rtol,atol,chem,2,Surf,w,iw);
index ff1341b..7af1541 100644 (file)
@@ -23,7 +23,7 @@
         <title>Syntax</title>
         <synopsis>yt=odedc(y0,nd,stdel,t0,t,f)</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
@@ -181,7 +181,7 @@ yp = f(t, yc, yd, flag, p1, p2,...)
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>y=odedc([y0c;y0d],nd,[h,delta],t0,t,f)</literal> computes
@@ -247,7 +247,7 @@ yd_k = f (t_k,yc(t_k-),yd(t_(k-1)),1)  (yc is time-continuous: yc(t_k-)=yc(tk))
             <literal>link</literal>).
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 //Linear system with switching input
@@ -264,7 +264,7 @@ xu=odedc([x0;u0],nu,stdel,0,t,phis);
 x=xu(1:2,:);
 u=xu(3,:);
 nx=2;
-plot2d1('onn',t',x',[1:nx],'161');
+plot2d(t, x', [1:nx], '161')
 plot2d2('onn',t',u',[nx+1:nx+nu],'000');
 //Fortran external (see fydot2.f):
 norm(xu-odedc([x0;u0],nu,stdel,0,t,'phis'),1)
@@ -283,7 +283,7 @@ norm(xu-odedc([x0;u0],nu,stdel,0,t,'phis'),1)
             x=xu(1:2,:);
             u=xu(3,:);
             nx=2;
-            plot2d1('onn',t',x',[1:nx],'161');
+            plot2d(t, x', [1:nx],'161')
             plot2d2('onn',t',u',[nx+1:nx+nu],'000');
             //Fortran external (see fydot2.f):
         </scilab:image>
index 805fb1f..0a2c2b7 100644 (file)
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * ...
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * along with this program.
  *
  -->
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="odedc" xml:lang="ja">
-    
     <refnamediv>
-        
         <refname>odedc</refname>
-        
         <refpurpose>離散/連続 ODE ソルバ</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>yt=odedc(y0,nd,stdel,t0,t,f)</synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="parameters">
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>y0</term>
-                
                 <listitem>
-                    
                     <para>実数列ベクトル (初期条件),
-                        
                         <literal>y0=[y0c;y0d]</literal> ただし <literal>y0d</literal> は
-                        
                         <literal>nd</literal> 個の要素を有します.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>nd</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         整数, <literal>y0d</literal>の次元
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>stdel</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         1個または2個の要素を有する実数ベクトル, <literal>stdel=[h,
-                            
                             delta]
-                            
                         </literal>
-                        
                         (デフォルト値は <literal>delta=0</literal> ).
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>t0</term>
-                
                 <listitem>
-                    
                     <para>実数のスカラー (初期時間).</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>t</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         実数 (行) ベクトル, <literal>yt</literal> が計算される時間
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>f</term>
-                
                 <listitem>
-                    
                     <para>外部,すなわち 関数または文字列または
-                        
                         呼び出し手順を指定するリスト: <literal>yp=f(t,yc,yd,flag)</literal>.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>f</term>
-                
                 <listitem>
-                    
                     <para>
-                        
-                        <link linkend="external" role="" version="">外部ルーチン</link> 
-                        
+                        <link linkend="external" role="" version="">外部ルーチン</link>
                         すなわち,関数または文字列またはリスト,
-                        
                         呼び出し手順は以下: <literal>yp=f(t,yc,yd,flag)</literal>
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>リスト</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     この形式の外部ルーチンは関数にパラメーラを
-                                    
                                     指定する際に使用されます.
-                                    
                                     以下のようにします:
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 list(f, p1, p2,...)
  ]]></programlisting>
-                                
                                 <para>
-                                    
                                     ただし,関数 <literal>f</literal>の呼び出し手順は,
-                                    
                                 </para>
-                                
                                 <programlisting role="no-scilab-exec"><![CDATA[
 yp = f(t, yc, yd, flag, p1, p2,...)
  ]]></programlisting>
-                                
                                 <para>
-                                    
                                     <literal>f</literal> はここでも
-                                    
                                     <literal>(t, yc, yd, flag, p1, p2,...)</literal>
-                                    
-                                    の関すとして関数値を返し, 
-                                    
+                                    の関すとして関数値を返し,
                                     <literal>p1, p2,...</literal> は関数パラメータです.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>文字列</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     Cまたはfortranルーチンの名前を参照する必要があり,
-                                    
                                     &lt;<literal>f_name</literal>&gt; が指定された名前と
-                                    
                                     仮定します.
-                                    
                                 </para>
-                                
                                 <itemizedlist>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             Fortranの呼び出し手順は以下となります
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>&lt;f_name&gt;(iflag, nc, nd, t, y, ydp)</literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>double precision t, y(*), ydp(*)
-                                                
                                             </literal>
-                                            
                                         </para>
-                                        
                                         <para>
-                                            
                                             <literal>integer iflag, nc, nd</literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>Cの呼び出し手順は以下となります</para>
-                                        
                                         <para>
-                                            
                                             <literal>void &lt;f_name&gt; (int *iflag, int *nc,
-                                                
                                                 int *nd, double *t, double *y, double *ydp)
-                                                
                                             </literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                 </itemizedlist>
-                                
                                 <para>FortranおよびCのケースは共に, 入力引数は以下となります:</para>
-                                
                                 <itemizedlist>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>iflag</literal> = <literal>0</literal> または<literal>1</literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>nc</literal> = 連続状態量の数 <literal>yc</literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>nd</literal> = 離散状態量の数 <literal>yd</literal>
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>t</literal> = 時間
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             <literal>y</literal> = <literal>[yc; yd; param]</literal>.
-                                            
                                             パラメータは
-                                            
                                             odedcコール
-                                            
                                             <literal>(y = odedc([y0c; y0d], nd, stdel, t0, t, list('fexcd', param)))</literal>
-                                            
                                             で指定された外部引数を取得する際に使用できます.
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                     <listitem>
-                                        
                                         <para>
-                                            
                                             出力 <literal>ydp</literal>と同様に,
-                                            
                                             このルーチンは
-                                            
                                             <literal>ydp[0:nc-1]) = d/dt ( yc(t) )</literal>
-                                            
                                             (<literal>iflag=0</literal>の場合) および
-                                            
                                             <literal>ydp[0:nd-1] = yd(t+)</literal>
-                                            
                                             (<literal>iflag=1</literal>の場合)
-                                            
                                             を計算する必要があります.
-                                            
                                         </para>
-                                        
                                     </listitem>
-                                    
                                 </itemizedlist>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>
-            
             <literal>y=odedc([y0c;y0d],nd,[h,delta],t0,t,f)</literal> は,
-            
             離散/連続混合系の解を計算します.
-            
             離散系の状態量 <literal>yd_k</literal> は以下のように
-            
             区間内は定数となる時間関数<literal>yd(t)</literal>として
-            
             組み込まれます:
-            
         </para>
-        
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 以下の t について yd(t) = yd_k
 [t_k=delay+k*h,t_(k+1)=delay+(k+1)*h] (ただし delay=h*delta).
  ]]></programlisting>
-        
         <para>シミュレーションされる方程式は以下のようになります:</para>
-        
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 dyc/dt = f(t,yc(t),yd(t),0),  for t in [t_k,t_(k+1)]
 yc(t0) = y0c
  ]]></programlisting>
-        
         <para>
-            
             そして, 時刻 <literal>t_k</literal> において
-            
             離散変数 <literal>yd</literal> が以下のように更新されます:
-            
         </para>
-        
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 yd(t_k+) = f(yc(t_k-),yd(t_k-),1)
  ]]></programlisting>
-        
         <para>
-            
             <literal>yd(t)</literal>の定義に基づき,
-            
             最後の式から以下が導かれることに注意してください
-            
         </para>
-        
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 yd_k = f (t_k,yc(t_k-),yd(t_(k-1)),1)  (yc は時間連続: yc(t_k-)=yc(tk))
  ]]></programlisting>
-        
         <para>
-            
             <literal>f</literal>をコールする際のパラメータは以下のように固定されています:
-            
             <literal>ycd=f(t,yc,yd,flag)</literal>;
-            
             この関数は, <literal>flag=0</literal> の場合に
-            
             微係数ベクトル <literal>yc</literal>,
-            
             <literal>flag=1</literal> の場合に
-            
             <literal>yd</literal> の更新値を返す必要があります.
-            
         </para>
-        
         <para>
-            
             <literal>ycd=dot(yc)</literal> は,
-            
             <literal>flag=0</literal>の場合には<literal>yc</literal>と同じ次元の
-            
             ベクトルである必要があり,
-            
             <literal>flag=1</literal>の場合には<literal>yd</literal>と同じ次元の
-            
             ベクトルである必要があります.
-            
         </para>
-        
         <para>
-            
             <literal>t</literal> は解<literal>y</literal>が計算される時刻を
-            
             表すベクトルです.
-            
         </para>
-        
         <para>
-            
             <literal>y</literal> は
-            
-            ベクトル<literal>y=[y(t(1)),y(t(2)),...]</literal>です.    
-            
+            ベクトル<literal>y=[y(t(1)),y(t(2)),...]</literal>です.
         </para>
-        
         <para>
-            
             この関数は <literal>ode</literal> 関数と同じオプションパラメータを指定して
-            
             コールすることができます
-            
-            (<literal>nd</literal> および <literal>stdel</literal> 
-            
-            はコール時に2番目および3番目のパラメータとして指定されます). 
-            
+            (<literal>nd</literal> および <literal>stdel</literal>
+            はコール時に2番目および3番目のパラメータとして指定されます).
             特に積分フラグ,許容誤差を設定することができます.
-            
             オプションのパラメータは <literal>odeoptions</literal> 関数により
-            
             設定できます.
-            
         </para>
-        
         <para>外部ルーチンをコールする例が
-            
             <literal>SCIDIR/default/fydot2.f</literal>に提供されています.
-            
         </para>
-        
         <para>
-            
             外部ルーチンは動的にリンクすることが可能です (<literal>link</literal>参照).
-            
         </para>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //切替入力を有する線形システム
 deff('xdu=phis(t,x,u,flag)','if flag==0 then xdu=A*x+B*u; else xdu=1-u;end');
 x0=[1;1];A=[-1,2;-2,-1];B=[1;2];u=0;nu=1;stdel=[1,0];u0=0;t=0:0.05:10;
 xu=odedc([x0;u0],nu,stdel,0,t,phis);x=xu(1:2,:);u=xu(3,:);
 nx=2;
-plot2d1('onn',t',x',[1:nx],'161');
+plot2d(t, x', [1:nx], '161')
 plot2d2('onn',t',u',[nx+1:nx+nu],'000');
-//Fortran外部関数 (fydot2.f参照): 
+//Fortran外部関数 (fydot2.f参照):
 norm(xu-odedc([x0;u0],nu,stdel,0,t,'phis'),1)
-//サンプル値フィードバック 
+//サンプル値フィードバック
 //
 //        |         xcdot=fc(t,xc,u)
 //  (システム)      |
@@ -548,48 +308,25 @@ plot2d([t',t',t'],xcd(1:3,:)');
 xset("window",2);plot2d2("gnn",[t',t'],xcd(4:5,:)');
 xset("window",0);
  ]]></programlisting>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="ode">ode</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="link">link</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="odeoptions">odeoptions</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="csim">csim</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="external">external</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
index 833e523..4973efe 100644 (file)
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="odedc" xml:lang="en">
     <refnamediv>
         <refname>odedc</refname>
-        <refpurpose>solucionador de EDOs contínuas/discretas</refpurpose>
+        <refpurpose>solucionador de EDOs contínuas/discretas</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>yt=odedc(y0,nd,stdel,t0,t,f)</synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>y0</term>
                 <listitem>
-                    <para>vetor coluna de reais (condições iniciais),
+                    <para>vetor coluna de reais (condições iniciais),
                         <literal>y0=[y0c;y0d]</literal> onde <literal>y0d</literal> tem
                         <literal>nd</literal> componentes.
                     </para>
@@ -39,7 +39,7 @@
                 <term>nd</term>
                 <listitem>
                     <para>
-                        inteiro, dimensão de <literal>y0d</literal>
+                        inteiro, dimensão de <literal>y0d</literal>
                     </para>
                 </listitem>
             </varlistentry>
@@ -51,7 +51,7 @@
                             delta]
                         </literal>
                         (com <literal>delta=0</literal> como valor
-                        padrão).
+                        padrão).
                     </para>
                 </listitem>
             </varlistentry>
@@ -65,7 +65,7 @@
                 <term>t</term>
                 <listitem>
                     <para>
-                        vetor (linha de reais), instantes onde <literal>yt</literal> é
+                        vetor (linha de reais), instantes onde <literal>yt</literal> é
                         calculado .
                     </para>
                 </listitem>
             <varlistentry>
                 <term>f</term>
                 <listitem>
-                    <para>função externa i.e. função, string ou lista com seqüência de
+                    <para>função externa i.e. função, string ou lista com seqüência de
                         chamamento: <literal>yp=f(t,yc,yd,flag)</literal>.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
             <literal>y=odedc([y0c;y0d],nd,[h,delta],t0,t,f)</literal> computa a
-            solução de um sistema misto contínuo/discreto. O estado de sistema
-            discreto <literal>yd_k</literal> é embutido em uma função de tempo
+            solução de um sistema misto contínuo/discreto. O estado de sistema
+            discreto <literal>yd_k</literal> é embutido em uma função de tempo
             seccional constante <literal>yd(t)</literal> como segue:
         </para>
         <programlisting role="no-scilab-exec"><![CDATA[
-yd(t)=yd_k para t em 
+yd(t)=yd_k para t em
 [t_k=atraso+k*h,t_(k+1)=delay+(k+1)*h] (com atraso=h*delta).
  ]]></programlisting>
-        <para>As equações simuladas são agora:</para>
+        <para>As equações simuladas são agora:</para>
         <programlisting role="no-scilab-exec"><![CDATA[
 dyc/dt=f(t,yc(t),yd(t),0),  para t em [t_k,t_(k+1)]
 yc(t0)=y0c
  ]]></programlisting>
         <para>
-            e nos instantes <literal>t_k</literal> a variável discreta
-            <literal>yd</literal> é atualizada por:
+            e nos instantes <literal>t_k</literal> a variável discreta
+            <literal>yd</literal> é atualizada por:
         </para>
         <programlisting role="no-scilab-exec"><![CDATA[
 yd(t_k+)=f(yc(t_k-),yd(t_k-),1)
  ]]></programlisting>
         <para>
-            Note que, utilizando a definição de <literal>yd(t)</literal>, a
-            última equação fornece
+            Note que, utilizando a definição de <literal>yd(t)</literal>, a
+            última equação fornece
         </para>
         <programlisting role="no-scilab-exec"><![CDATA[
-yd_k = f (t_k,yc(t_k-),yd(t_(k-1)),1)  (yc é de tempo contínuo: yc(t_k-)=yc(tk))
+yd_k = f (t_k,yc(t_k-),yd(t_(k-1)),1)  (yc é de tempo contínuo: yc(t_k-)=yc(tk))
  ]]></programlisting>
         <para>
-            Os parâmetros de chamada de <literal>f</literal> são fixados:
-            <literal>ycd=f(t,yc,yd,flag)</literal>; esta função deve retornar a
+            Os parâmetros de chamada de <literal>f</literal> são fixados:
+            <literal>ycd=f(t,yc,yd,flag)</literal>; esta função deve retornar a
             derivada do vetor <literal>yc</literal> se <literal>flag=0</literal> ou a
-            atualização de <literal>yd</literal> se <literal>flag=1</literal>.
+            atualização de <literal>yd</literal> se <literal>flag=1</literal>.
         </para>
         <para>
-            <literal>ycd=dot(yc)</literal> deve ser um vetor de mesma dimensão
+            <literal>ycd=dot(yc)</literal> deve ser um vetor de mesma dimensão
             que <literal>yc</literal> se <literal>flag=0</literal> e
-            <literal>ycd=update(yd)</literal> deve ser um vetor com a mesma dimensão
+            <literal>ycd=update(yd)</literal> deve ser um vetor com a mesma dimensão
             que <literal>yd</literal> se <literal>flag=1</literal>.
         </para>
         <para>
-            <literal>t</literal> é um vetor de constantes onde a solução
-            <literal>y</literal> é computada.
+            <literal>t</literal> é um vetor de constantes onde a solução
+            <literal>y</literal> é computada.
         </para>
         <para>
-            <literal>y</literal> é o vetor
-            <literal>y=[y(t(1)),y(t(2)),...]</literal>.     
+            <literal>y</literal> é o vetor
+            <literal>y=[y(t(1)),y(t(2)),...]</literal>.
         </para>
         <para>
-            Esta função pode ser chamada
-            com os mesmo parâmetro opcionais da função <literal>ode</literal> (desde
+            Esta função pode ser chamada
+            com os mesmo parâmetro opcionais da função <literal>ode</literal> (desde
             que <literal>nd</literal> e <literal>stdel</literal> sejam dados na
-            seqüência de chamamento como segundo e terceiro parâmetros). Em
-            particular, flags de integração e tolerâncias podem ser ajustadas.
-            Parâmetros opcionais podem ser ajustados pela função
+            seqüência de chamamento como segundo e terceiro parâmetros). Em
+            particular, flags de integração e tolerâncias podem ser ajustadas.
+            Parâmetros opcionais podem ser ajustados pela função
             <literal>odeoptions</literal>.
         </para>
-        <para>Um exemplo para chamada de rotina externa é encontrado em
+        <para>Um exemplo para chamada de rotina externa é encontrado em
             <literal>SCIDIR/default/fydot2.f</literal>
         </para>
         <para>Rotinas externas podem ser ligadas dinamicamente (ver
             <literal>link</literal>).
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //sistema linear com entrada alternante
 deff('xdu=phis(t,x,u,flag)','if flag==0 then xdu=A*x+B*u; else xdu=1-u;end');
 x0=[1;1];A=[-1,2;-2,-1];B=[1;2];u=0;nu=1;stdel=[1,0];u0=0;t=0:0.05:10;
 xu=odedc([x0;u0],nu,stdel,0,t,phis);x=xu(1:2,:);u=xu(3,:);
 nx=2;
-plot2d1('onn',t',x',[1:nx],'161');
+plot2d(t, x', [1:nx],'161')
 plot2d2('onn',t',u',[nx+1:nx+nu],'000');
 
-//função externa FORTRAN (ver fydot2.f): 
+//função externa FORTRAN (ver fydot2.f):
 norm(xu-odedc([x0;u0],nu,stdel,0,t,'phis'),1)
 
 //feedback (resposta) amostrado
@@ -188,14 +188,14 @@ deff('u=hd(t,x)','u=Cd*x')
 h=0.1;t0=0;t=0:0.1:2;
 x0c=[0;0;0];x0d=[0;0];nd=2;
 xcd=odedc([x0c;x0d],nd,h,t0,t,f);
-norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd1')) // cálculo rápido (ver fydot2.f)
+norm(xcd-odedc([x0c;x0d],nd,h,t0,t,'fcd1')) // cálculo rápido (ver fydot2.f)
 plot2d([t',t',t'],xcd(1:3,:)');
 xset("window",2);plot2d2("gnn",[t',t'],xcd(4:5,:)');
 xset("window",0);
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="ode">ode</link>
index 1ad7276..a69ffa3 100644 (file)
@@ -3,7 +3,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * ...
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -23,7 +23,7 @@
         <title>Последовательность вызова</title>
         <synopsis>yt=odedc(y0,nd,stdel,t0,t,f)</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Описание</title>
         <para>
             <literal>y=odedc([y0c;y0d],nd,[h,delta],t0,t,f)</literal> вычисляет решение смешанной дискретно-непрерывной системы. Состояние дискретной системы <literal>yd_k</literal> вложено в кусочно-постоянную функцию времени <literal>yd(t)</literal> в виде:
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 yd(t) = yd_k для t в
 [t_k=delay+k*h, t_(k+1)=delay+(k+1)*h] (с задержкой delay=h*delta).
  ]]></programlisting>
         <para>Теперь моделируемые уравнения имеют вид:</para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 dyc/dt = f(t,yc(t),yd(t),0),  для t в [t_k,t_(k+1)]
 yc(t0) = y0c
  ]]></programlisting>
@@ -93,25 +93,25 @@ yc(t0) = y0c
             и в моменты времени <literal>t_k</literal> дискретная переменная
             <literal>yd</literal> обновляется как:
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 yd(t_k+) = f(yc(t_k-),yd(t_k-),1)
  ]]></programlisting>
         <para>
             Заметьте, что, используя определение <literal>yd(t)</literal>, последнее уравнение даёт
         </para>
-        <programlisting role="no-scilab-exec"><![CDATA[ 
+        <programlisting role="no-scilab-exec"><![CDATA[
 yd_k = f (t_k,yc(t_k-),yd(t_(k-1)),1)  (yc непрерывно во времени: yc(t_k-)=yc(tk))
  ]]></programlisting>
         <para>
             Параметры вызова <literal>f</literal> фиксированы:
-            <literal>ycd=f(t,yc,yd,flag)</literal>; эта функция должно возвращать либо производную 
-            вектора <literal>yc</literal>, если <literal>flag=0</literal>, либо обновлять 
+            <literal>ycd=f(t,yc,yd,flag)</literal>; эта функция должно возвращать либо производную
+            вектора <literal>yc</literal>, если <literal>flag=0</literal>, либо обновлять
             <literal>yd</literal>, если <literal>flag=1</literal>.
         </para>
         <para>
-            <literal>ycd=dot(yc)</literal> должна быть вектором того же размера, что и 
-            <literal>yc</literal>, если <literal>flag=0</literal> и <literal>ycd=update(yd)</literal> 
-            должна быть вектором того же размера, что и <literal>yd</literal>, если 
+            <literal>ycd=dot(yc)</literal> должна быть вектором того же размера, что и
+            <literal>yc</literal>, если <literal>flag=0</literal> и <literal>ycd=update(yd)</literal>
+            должна быть вектором того же размера, что и <literal>yd</literal>, если
             <literal>flag=1</literal>.
         </para>
         <para>
@@ -119,13 +119,13 @@ yd_k = f (t_k,yc(t_k-),yd(t_(k-1)),1)  (yc непрерывно во време
             <literal>y</literal>.
         </para>
         <para>
-            <literal>y</literal> -- это вектор <literal>y=[y(t(1)),y(t(2)),...]</literal>.  
+            <literal>y</literal> -- это вектор <literal>y=[y(t(1)),y(t(2)),...]</literal>.
         </para>
         <para>
             Эта функция может быть вызвана с теми же самыми необязательными параметрами, что и функция <literal>ode</literal>
-            (указанные <literal>nd</literal> и <literal>stdel</literal> даны в последовательности 
-            вызова как второй и третий параметры). В частности, могут быть установлены флаги 
-            интегрирования, допуски. Необязательные параметры могут быть установлены с помощью 
+            (указанные <literal>nd</literal> и <literal>stdel</literal> даны в последовательности
+            вызова как второй и третий параметры). В частности, могут быть установлены флаги
+            интегрирования, допуски. Необязательные параметры могут быть установлены с помощью
             функции <literal>odeoptions</literal>.
         </para>
         <para>
@@ -133,23 +133,23 @@ yd_k = f (t_k,yc(t_k-),yd(t_(k-1)),1)  (yc непрерывно во време
             <literal>SCIDIR/default/fydot2.f</literal>
         </para>
         <para>
-            Внешние процедуры могут быть динамически скомпонованы (см. 
+            Внешние процедуры могут быть динамически скомпонованы (см.
             <link linkend="link">link</link>).
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Линейная система с переключающимися входами
 deff('xdu=phis(t,x,u,flag)','if flag==0 then xdu=A*x+B*u; else xdu=1-u;end');
 x0=[1;1];A=[-1,2;-2,-1];B=[1;2];u=0;nu=1;stdel=[1,0];u0=0;t=0:0.05:10;
 xu=odedc([x0;u0],nu,stdel,0,t,phis);x=xu(1:2,:);u=xu(3,:);
 nx=2;
-plot2d1('onn',t',x',[1:nx],'161');
+plot2d(t, x', [1:nx], '161')
 plot2d2('onn',t',u',[nx+1:nx+nu],'000');
-//Внешняя процедура Fortran (см. fydot2.f): 
+//Внешняя процедура Fortran (см. fydot2.f):
 norm(xu-odedc([x0;u0],nu,stdel,0,t,'phis'),1)
+
 //Дискретизированная обратная связь
 //
 //      |    xcdot=fc(t,xc,u)
index 3de41ee..819648a 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -22,7 +22,7 @@
         <title>Syntax</title>
         <synopsis>x=squarewave(t [,percent])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
@@ -49,7 +49,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>squarewave(t)</literal> generates the vector of the values
             positive.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-t=(0:0.1:5*%pi)';
-plot2d1('onn',t,[2*sin(t),1.5*squarewave(t),squarewave(t,10)])
+        <programlisting role="example"><![CDATA[
+t = (0:0.1:5*%pi)';
+plot2d(t, [2*sin(t), 1.5*squarewave(t), squarewave(t,10)])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 3b97654..b9483b8 100644 (file)
@@ -8,7 +8,7 @@
         <title>Séquence d'appel</title>
         <synopsis>x=squarewave(t [,percent)</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
@@ -35,7 +35,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>squarewave(t)</literal> génère le vecteur des valeurs d'un
             le signal est positif.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-t=(0:0.1:5*%pi)';
-plot2d1('onn',t,[2*sin(t),1.5*squarewave(t),squarewave(t,10)])
+        <programlisting role="example"><![CDATA[
+t = (0:0.1:5*%pi)';
+plot2d(t, [2*sin(t), 1.5*squarewave(t), squarewave(t,10)])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index a5940af..2e15d30 100644 (file)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * along with this program.
  *
  -->
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="squarewave" xml:lang="ja">
-    
     <refnamediv>
-        
         <refname>squarewave</refname>
-        
         <refpurpose>周期 2*%piの矩形波を生成</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>x=squarewave(t [,percent])</synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="parameters">
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>t</term>
-                
                 <listitem>
-                    
                     <para>実数ベクトル, 離散時間</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>x</term>
-                
                 <listitem>
-                    
                     <para>実数ベクトル, 各時間における集合 (-1,+1)の波の値</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>percent</term>
-                
                 <listitem>
-                    
                     <para>実数の正のスカラー値で,
-                        
                         信号の符号が正となる周期の割合.
-                        
                         デフォルト値は 50
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>
-            
             <literal>squarewave(t)</literal> は
-            
             <literal>t</literal>ベクトルで指定された点において
-            
             周期 2*%pi の矩形波の値からなるベクトルを
-            
             生成します.
-            
         </para>
-        
         <para>
-            
             <literal>squarewave(t,%)</literal> は
-            
             <literal>%</literal>が信号が正となる周期の割合(パーセント)となるような
-            
             矩形波を生成します.
-            
         </para>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-t=(0:0.1:5*%pi)';
-plot2d1('onn',t,[2*sin(t),1.5*squarewave(t),squarewave(t,10)])
+        <programlisting role="example"><![CDATA[
+t = (0:0.1:5*%pi)';
+plot2d(t, [2*sin(t), 1.5*squarewave(t), squarewave(t,10)])
  ]]></programlisting>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="sin">sin</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="cos">cos</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
index 4c1fc16..9b7d659 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="squarewave" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="squarewave" xml:lang="pt">
     <refnamediv>
         <refname>squarewave</refname>
-        <refpurpose>gera uma onda quadrada de período 2*%pi</refpurpose>
+        <refpurpose>gera uma onda quadrada de período 2*%pi</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>x=squarewave(t [,percent])</synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>t</term>
                 <listitem>
-                    <para>vetor de reais, discretização do tempo </para>
+                    <para>vetor de reais, discretização do tempo </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>x</term>
                 <listitem>
                     <para>vetor de reais, o valor da onda em cada ponto do tempo no
-                        conjunto (-1,+1) 
+                        conjunto (-1,+1)
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>percent</term>
                 <listitem>
-                    <para>escalar real positivo, a porcentagem do período no qual o
-                        sinal é positivo. O valor padrão é 50
+                    <para>escalar real positivo, a porcentagem do período no qual o
+                        sinal é positivo. O valor padrão é 50
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
             <literal>squarewave(t)</literal> gera o vetor dos valores da onda
-            quadrada de período 2*%pi em cada data dada no vetor <literal>t</literal>
+            quadrada de período 2*%pi em cada data dada no vetor <literal>t</literal>
             .
         </para>
         <para>
             <literal>squarewave(t,%)</literal> gera uma onda quadrada tal que %
-            é a porcentagem do período no qual o sinal é positivo.
+            é a porcentagem do período no qual o sinal é positivo.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-t=(0:0.1:5*%pi)';
-plot2d1('onn',t,[2*sin(t),1.5*squarewave(t),squarewave(t,10)])
+        <programlisting role="example"><![CDATA[
+t = (0:0.1:5*%pi)';
+plot2d(t, [2*sin(t), 1.5*squarewave(t), squarewave(t,10)])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="sin">sin</link>
index 3f6aa03..b4acd0a 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -22,7 +22,7 @@
         <title>Последовательность вызова</title>
         <synopsis>x=squarewave(t [,percent])</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Описание</title>
         <para>
-            <literal>squarewave(t)</literal> формирует вектор значений меандра с периодом 
-            <literal>2*%pi</literal> для каждого момента времени, данного в векторе 
+            <literal>squarewave(t)</literal> формирует вектор значений меандра с периодом
+            <literal>2*%pi</literal> для каждого момента времени, данного в векторе
             <literal>t</literal>.
         </para>
         <para>
-            <literal>squarewave(t,percent)</literal> формирует меандр такой, что 
+            <literal>squarewave(t,percent)</literal> формирует меандр такой, что
             <literal>percent</literal> является процентом от периода, в котором сигнал положителен.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Примеры</title>
-        <programlisting role="example"><![CDATA[ 
-t=(0:0.1:5*%pi)';
-plot2d1('onn',t,[2*sin(t),1.5*squarewave(t),squarewave(t,10)])
+        <programlisting role="example"><![CDATA[
+t = (0:0.1:5*%pi)';
+plot2d(t, [2*sin(t), 1.5*squarewave(t), squarewave(t,10)])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index e14d729..57cf6ab 100644 (file)
@@ -7,9 +7,7 @@ demopath = get_absolute_file_path("2d_3d_plots.dem.gateway.sce");
 
 subdemolist = [                                   ..
 "plot2d"         , "plot2d.dem.sce"          ; ..
-"plot2d1 (1)"    , "plot2d1_1.dem.sce"       ; ..
 "plot2d3"        , "plot2d3.dem.sce"         ; ..
-"plot2d1 (2)"    , "plot2d1_2.dem.sce"       ; ..
 "plotyy"         , "plotyy.dem.sce"          ; ..
 "plotyyy"        , "plotyyy.dem.sce"         ; ..
 "histplot"       , "histplot.dem.sce"        ; ..
diff --git a/scilab/modules/graphics/demos/2d_3d_plots/plot2d1_1.dem.sce b/scilab/modules/graphics/demos/2d_3d_plots/plot2d1_1.dem.sce
deleted file mode 100644 (file)
index a3b5c1f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2007-2008 - INRIA
-// Copyright (C) 2010 - DIGITEO - Allan CORNET
-//
-// This file is released under the 3-clause BSD license. See COPYING-BSD.
-
-function demo_plot2d_1()
-
-    my_handle             = scf(100001);
-    clf(my_handle,"reset");
-    demo_viewCode("plot2d1_1.dem.sce");
-
-    // DEMO START
-
-    my_plot_desc          = "plot2d1 log scale";
-    my_handle.figure_name = my_plot_desc;
-
-    plot2d1("enl",1,(1:10:10000)');
-    xtitle(my_plot_desc,"t","y  log scale");
-    xgrid(3);
-
-    // DEMO END
-endfunction
-
-demo_plot2d_1();
-clear demo_plot2d_1;
\ No newline at end of file
diff --git a/scilab/modules/graphics/demos/2d_3d_plots/plot2d1_2.dem.sce b/scilab/modules/graphics/demos/2d_3d_plots/plot2d1_2.dem.sce
deleted file mode 100644 (file)
index 6f22895..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2007-2008 - INRIA
-// Copyright (C) 2010 - DIGITEO - Allan CORNET
-//
-// This file is released under the 3-clause BSD license. See COPYING-BSD.
-
-function demo_plot2d1_2()
-
-    my_handle             = scf(100001);
-    clf(my_handle,"reset");
-    demo_viewCode("plot2d1_2.dem.sce");
-
-    // DEMO START
-
-    my_plot_desc          = "plot2d1";
-    my_handle.figure_name = my_plot_desc;
-
-    rand("normal")
-    v=(1:20)+(1:20).*rand(1,20);
-
-    plot2d1("enn",1,v');
-    plot2d1("enn",1,(1:20)',[2,-2],"100","estimated");
-    xtitle(my_plot_desc," "," "," ");
-
-    // DEMO END
-endfunction
-
-demo_plot2d1_2();
-clear demo_plot2d1_2;
index d49dd41..e9f0a65 100644 (file)
@@ -4,7 +4,7 @@
  * Copyright (C) INRIA
  * Copyright (C) 2009 - DIGITEO - Pierre Lando
  * Copyright (C) 2010 - DIGITEO - Yann Collette
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -821,9 +821,6 @@ a.isoview='off';
                 <link linkend="plot">plot</link>
             </member>
             <member>
-                <link linkend="plot2d1">plot2d1</link>
-            </member>
-            <member>
                 <link linkend="plot2d2">plot2d2</link>
             </member>
             <member>
diff --git a/scilab/modules/graphics/help/en_US/2d_plot/plot2d1.xml b/scilab/modules/graphics/help/en_US/2d_plot/plot2d1.xml
deleted file mode 100644 (file)
index 3a44105..0000000
+++ /dev/null
@@ -1,197 +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="plot2d1">
-    <refnamediv>
-        <refname>plot2d1</refname>
-        <refpurpose>
-            2D plot (logarithmic axes). <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>plot2d1(str,x,y,[style,strf,leg,rect,nax])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>str</term>
-                <listitem>
-                    <para>
-                        is a string of length three <literal>"abc"</literal>.
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>a</term>
-                            <listitem>
-                                <para>
-                                    can have the following values: <literal>e</literal>,
-                                    <literal>o</literal> or <literal>g</literal>.
-                                </para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>e</term>
-                                        <listitem>
-                                            <para>means "empty". Itspecifies the fact that the value
-                                                of <literal>x</literal> is not used (the <literal>x</literal> values
-                                                are supposed to be regularly spaced, ie 1:&lt;number of
-                                                rows of <literal>y</literal>&gt;). The user must anyway give a
-                                                value for <literal>x</literal>, 1 for instance:
-                                                <literal>plot2d1("enn",1,y)</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>o</term>
-                                        <listitem>
-                                            <para>means "one". If there are many curves, they all
-                                                have the same x-values: <literal>x</literal> is a column
-                                                vector of size nl and <literal>y</literal> is a matrix of size
-                                                (nl,nc). For example :
-                                                <literal>x=[0:0.1:2*%pi]';plot2d1("onn",x,[sin(x) cos(x)])</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>g</term>
-                                        <listitem>
-                                            <para>
-                                                means "general". <literal>x</literal> and <literal>y</literal>
-                                                must have the same size (nl,nc). Each column of
-                                                <literal>y</literal> is plotted with respect to the
-                                                corresponding column of <literal>x</literal>. <literal>nc</literal>
-                                                curves are plotted using <literal>nl</literal> points.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>b, c</term>
-                            <listitem>
-                                <para>
-                                    can have the values <literal>n</literal> (normal) or
-                                    <literal>l</literal> (logarithmic).
-                                </para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>b=l</term>
-                                        <listitem>
-                                            <para>a logarithmic axis is used on the x-axis</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>c=l</term>
-                                        <listitem>
-                                            <para>a logarithmic axis is used on the y-axis</para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>x,y,[style,strf,leg,rect,nax]</term>
-                <listitem>
-                    <para>these arguments have the same meaning as in the
-                        <literal>plot2d</literal> function.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>opt_args</term>
-                <listitem>
-                    <para>these arguments have the same meaning as in the
-                        <literal>plot2d</literal> function.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            This function is obsolete. USE <literal>plot2d</literal> INSTEAD !!
-        </para>
-        <para>
-            <literal>plot2d1</literal> plots a set of 2D curves. It is the same as
-            <literal>plot2d</literal> but with one more argument <literal>str</literal> which
-            enables logarithmic axis. Moreover, it allows to specify only one column
-            vector for <literal>x</literal> when it is the same for all the curves.
-        </para>
-        <para>By default, successive plots are superposed. To clear the previous
-            plot, use <literal>clf</literal>.
-        </para>
-        <para>
-            Enter the command <literal>plot2d1()</literal> to see a demo.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-// multiple plot without giving x
-x=[0:0.1:2*%pi]';
-plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
- ]]></programlisting>
-        <scilab:image>
-            x=[0:0.1:2*%pi]';
-            plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
-        </scilab:image>
-        <programlisting role="example"><![CDATA[
-// multiple plot using only one x
-clf()
-x=[0:0.1:2*%pi]';
-plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
- ]]></programlisting>
-        <scilab:image>
-            x=[0:0.1:2*%pi]';
-            plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
-        </scilab:image>
-        <programlisting role="example"><![CDATA[
-// logarithmic plot
-x=[0.1:0.1:3]';
-clf();
-plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
- ]]></programlisting>
-        <scilab:image>
-            x=[0.1:0.1:3]';
-            plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
-        </scilab:image>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="plot2d">plot2d</link>
-            </member>
-            <member>
-                <link linkend="plot2d2">plot2d2</link>
-            </member>
-            <member>
-                <link linkend="plot2d3">plot2d3</link>
-            </member>
-            <member>
-                <link linkend="plot2d4">plot2d4</link>
-            </member>
-            <member>
-                <link linkend="clf">clf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 60fecf9..fec84ae 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -27,7 +27,7 @@
             plot2d3(x,y &lt;,opt_args&gt;)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
@@ -40,7 +40,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>plot2d3</literal> is the same as <literal>plot2d</literal> but curves are
             </note>
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-// compare the following with plot2d1
-x=[0:0.1:2*%pi]';
-plot2d3(x,[sin(x) sin(2*x) sin(3*x)])
+        <programlisting role="example"><![CDATA[
+x = [0:0.1:2*%pi]';
+plot2d3(x, [sin(x) sin(2*x) sin(3*x)])
  ]]></programlisting>
         <scilab:image>
-            x=[0:0.1:2*%pi]';
-            plot2d3(x,[sin(x) sin(2*x) sin(3*x)])
+            x = [0:0.1:2*%pi]';
+            plot2d3(x, [sin(x) sin(2*x) sin(3*x)])
         </scilab:image>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 clf()
-x=[0:0.1:2*%pi]';
-plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-e=gce();
+x = [0:0.1:2*%pi]';
+plot2d(x, [sin(x) sin(2*x) sin(3*x)])
+e = gce();
 e.children(1).polyline_style=3;
 e.children(2).polyline_style=3;
 e.children(3).polyline_style=3;
index 6f633c0..febe3f9 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -25,7 +25,7 @@
             plot2d4(x,y &lt;,opt_args&gt;)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
@@ -38,7 +38,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             <literal>plot2d4</literal> is the same as <literal>plot2d</literal> but curves are
             </note>
         </para>
     </refsection>
-    <refsection>
-        <title>Sample</title>
-        <scilab:image>plot2d4();</scilab:image>
-    </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-// compare the following with plot2d1
-x=[0:0.1:2*%pi]';
+        Demo: plot2d4();
+        <scilab:image>plot2d4();</scilab:image>
+        Examples:
+        <programlisting role="example"><![CDATA[
+// compare the following with plot2d + .polyline_style=4
+clf
+subplot(2,1,1)
+x = [0:0.1:2*%pi]';
 plot2d4(x,[sin(x) sin(2*x) sin(3*x)])
-clf()
+
+subplot(2,1,2)
 plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-e=gce();
-e.children(1).polyline_style=4;
-e.children(2).polyline_style=4;
-e.children(3).polyline_style=4;
+gce().children.polyline_style=4;
  ]]></programlisting>
         <scilab:image>
-            x=[0:0.1:2*%pi]';
-            plot2d4(x,[sin(x) sin(2*x) sin(3*x)])
+            x = [0:0.1:2*%pi]';
+            plot2d4(x, [sin(x) sin(2*x) sin(3*x)])
         </scilab:image>
-        
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
index c178367..9ac4a58 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 1992 - INRIA - Serge Steer
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -24,7 +24,7 @@
             [xi,xa,np]=graduate( xmi, xma)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
-            graduate looks for the minimum interval <literal>[xi,xa]</literal> and a number of tics 
+            graduate looks for the minimum interval <literal>[xi,xa]</literal> and a number of tics
             <literal>np</literal> such that:
         </para>
         <para>
             <literal>n1 &lt; np &lt; n2</literal>
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-y=(0:0.33:145.78)';
-clf();
-plot2d1('enn',0,y)
-[ymn,ymx,np]=graduate(min(y),max(y))
-rect=[1,ymn,prod(size(y)),ymx];
+        <programlisting role="example"><![CDATA[
+y = (0:0.33:145.78)';
 clf();
-plot2d1('enn',0,y,1,'011',' ',rect,[10,3,10,np])
+subplot(1,2,1)
+plot2d(y)
+
+subplot(1,2,2)
+[ymn,ymx,np] = graduate(min(y), max(y))
+rect = [1, ymn, prod(size(y)),ymx];
+plot2d([], y, 1,'011',' ',rect,[10,3,10,np])
 ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 9351e87..415a200 100644 (file)
         <title>Description</title>
         <para>
             <literal>plotframe</literal> is used with 2D plotting functions
-            <link linkend="plot2d">plot2d</link>, <link linkend="plot2d1">plot2d1</link>,... to set a graphics frame. It must be
+            <link linkend="plot2d">plot2d</link>, <link linkend="plot2d2">plot2d2</link>,... to set
+            a graphics frame. It must be
             used before <literal>plot2d</literal> which should be invoked with the
             "000" superposition mode.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x=[-0.3:0.8:27.3]';
 y=rand(x);
 rect=[min(x),min(y),max(x),max(y)];
index e667711..6836584 100644 (file)
@@ -3,7 +3,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Djalel Abdemouche
  * Copyright (C) INRIA - Fabrice Leray
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -25,7 +25,7 @@
         <title>Syntax</title>
         <synopsis>drawlater()</synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>This function can be used not to display immediately onto the
             <literal>current figure</literal> the next created graphics objects - i.e. by
             </warning>
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Example :  one axes / one figure
-drawlater(); 
+drawlater();
 xfarc(.25,.55,.1,.15,0,64*360);
 xfarc(.55,.55,.1,.15,0,64*360);
-xfrect(.3,.8,.3,.2); 
-xfrect(.2,.7,.5,.2);  
+xfrect(.3,.8,.3,.2);
+xfrect(.2,.7,.5,.2);
 xfrect(.32,.78,.1,.1);
 xfrect(.44,.78,.14,.1);
 xfrect(-.2,.4,1.5,.8);
-xstring(0.33,.9,"A Scilab Car");    
+xstring(0.33,.9,"A Scilab Car");
 a=get("current_axes");
 a.children(1).font_size=4;
-a.children(1).font_style=4;  
+a.children(1).font_style=4;
 a.children(1).background=5;
 a.children(3).background=8;
-a.children(4).background=8; 
+a.children(4).background=8;
 a.children(5).background=17;
-a.children(6).background=17; 
+a.children(6).background=17;
 a.children(7).background=25;
 a.children(8).background=25;
-xclick();drawnow();
-//Example 2:: two axes / one figure
+xclick();
+drawnow();
 
+//Example 2:: two axes / one figure
+clf
+subplot(211)
+drawlater    // what will be present in this axes will be displayed later
+plot2d       // nothing is displayed => feeds the graphical buffer
 subplot(212)
-a=gca();
-drawlater // what will be present in this axes will be displayed later
-plot2d // draw these axes and children later...
-
-subplot(211) // Warning: we change the axes
-plot2d1 // default drawing mode
-
-drawnow() // all is visible
+plot3d
+drawnow      // the graphical buffer is flushed: all its contents become visible
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 573596b..a1ce84f 100644 (file)
@@ -10,7 +10,7 @@
             [xi,xa,np]=graduate( xmi, xma)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
@@ -43,7 +43,7 @@
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Description</title>
         <para>
             graduate recherche l'intervalle minimum <literal>[xi,xa]</literal> et un nombre de graduations 
             <literal>n1 &lt; np &lt; n2</literal>
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-  y=(0:0.33:145.78)';
-  clf();plot2d1('enn',0,y)
-  [ymn,ymx,np]=graduate(min(y),max(y))
-  rect=[1,ymn,prod(size(y)),ymx];
-  clf();plot2d1('enn',0,y,1,'011',' ',rect,[10,3,10,np])
+y = (0:0.33:145.78)';
+clf();
+subplot(1,2,1)
+plot2d(y)
+
+subplot(1,2,2)
+[ymn,ymx,np] = graduate(min(y), max(y))
+rect = [1, ymn, prod(size(y)),ymx];
+plot2d([], y, 1,'011',' ',rect,[10,3,10,np])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 3e147ae..646f5c2 100644 (file)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) INRIA
-
  * Copyright (C) 2009 - DIGITEO - Pierre Lando
-
  * Copyright (C) 2010 - DIGITEO - Yann Collette
-
- * 
-
-
+ *
  * 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:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="plot2d" xml:lang="ja">
-    
     <refnamediv>
-        
         <refname>plot2d</refname>
-        
         <refpurpose>2Dプロット</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>
-            
             plot2d([logflag,][x,],y[,style[,strf[,leg[,rect[,nax]]]]])
-            
             plot2d([logflag,][x,],y,&lt;opt_args&gt;)
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
     <refsection>
-        
         <title>パラメータ</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>x</term>
-                
                 <listitem>
-                    
-                    <para>実数の行列またはベクトル. 省略された場合, 
-                        
+                    <para>実数の行列またはベクトル. 省略された場合,
                         ベクトル<literal>1:n</literal>が指定されたと仮定します.
-                        
                         ただし, <literal>n</literal>は<literal>y</literal>
-                        
                         パラメータで指定された曲線の点の数です.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>y</term>
-                
                 <listitem>
-                    
                     <para>実数の行列またはベクトル.</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>&lt;opt_args&gt;</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         一連の命令 <literal>key1=value1,key2=value2</literal>,...
-                        
                         を表します.
-                        
                         ただし, <literal>key1</literal>, <literal>key2,...</literal>
-                        
                         には以下のどれかを指定できます:
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>logflag</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     軸スケール (線形または対数)を設定します.
-                                    
                                     値は文字列で, 以下の値のどれかを指定します:
-                                    
                                     <literal>"nn"</literal>, <literal>"nl"</literal> ,
-                                    
                                     <literal>"ln"</literal> および <literal>"ll"</literal> .
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>style</term>
-                            
                             に
-                            
                             <listitem>
-                                
                                 <para>各曲線のスタイルを設定します.
-                                    
                                     値は整数値(正または負)を有する実数ベクトルを指定します.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>strf</term>
-                            
                             <listitem>
-                                
                                 <para>凡例の表示を制御します.</para>
-                                
                                 <para>
-                                    
                                     <literal>strf</literal> は長さ3の文字列
-                                    
                                     <literal>"xyz"</literal>です.
-                                    
                                     (デフォルトでは,<literal>strf="081"</literal>)
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>leg</term>
-                            
                             <listitem>
-                                
                                 <para>曲線の凡例を設定します.
-                                    
                                     値には文字列を指定します.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>rect</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     プロットに使用する最小限の領域を設定します.
-                                    
                                     値には以下の4個のエントリを有する実数ベクトルを指定します:
-                                    
                                     <literal>[xmin,ymin,xmax,ymax]</literal>.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>nax</term>
-                            
                             <listitem>
-                                
                                 <para>軸ラベルと目盛の定義を設定します.
-                                    
                                     値には4個の整数エントリ<literal>[nx,Nx,ny,Ny]</literal>を有する
-                                    
                                     実数ベクトルを指定します.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag</term>
-                            
                             <listitem>
-                                
                                 <para>指定された最小限の領域に基づく実際の座標系の範囲の
-                                    
                                     計算を制御します.
-                                    
                                     値には, 0 から 8までの範囲の整数を指定します.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>axesflag</term>
-                            
                             <listitem>
-                                
                                 <para>軸の描画方法を指定します. 値には,
-                                    
                                     0 から 5までの範囲の整数を指定します.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>説明</title>
-        
         <para>
-            
             <literal>plot2d</literal> は一連の2次元曲線をプロットします.
-            
-            Matlabの<literal>plot</literal>構文に慣れている場合には, 
-            
+            Matlabの<literal>plot</literal>構文に慣れている場合には,
             <link linkend="plot">plot</link>を使用するべきです.
-            
         </para>
-        
         <para>
-            
             <literal>x</literal> および <literal>y</literal> がベクトルの場合,
-            
             plot2d(x,y,&lt;opt_args&gt;) はベクトル <literal>y</literal> を
-            
-            ベクトル <literal>x</literal>に対してプロットします. 
-            
+            ベクトル <literal>x</literal>に対してプロットします.
             ベクトル<literal>x</literal> および <literal>y</literal>は
-            
             同じ数のエントリを有する必要があります.
-            
         </para>
-        
         <para>
-            
             <literal>x</literal> がベクトルで <literal>y</literal> が行列の場合,
-            
             plot2d(x,y,&lt;opt_args&gt;) は<literal>y</literal>の各列を
-            
             ベクトル<literal>x</literal>に対してプロットします.
-            
             この場合,<literal>y</literal>の列の数は<literal>x</literal>
-            
             のエントリの数に等しい必要があります.
-            
         </para>
-        
         <para>
-            
             <literal>x</literal> および <literal>y</literal> が行列の場合,
-            
             plot2d(x,y,&lt;opt_args&gt;) は<literal>y</literal>の各列を
-            
             対応する<literal>x</literal>の列に対してプロットします.
-            
             この場合,<literal>x</literal> と<literal>y</literal>の
-            
             大きさは同じである必要があります.
-            
         </para>
-        
         <para>
-            
             <literal>y</literal> がベクトルの場合, plot2d(y,&lt;opt_args&gt;)
-            
             はベクトル <literal>y</literal> をベクトル
-            
             <literal>1:size(y,'*')</literal>に対してプロットします.
-            
         </para>
-        
         <para>
-            
             <literal>y</literal> が行列の場合, plot2d(y,&lt;opt_args&gt;)
-            
             は<literal>y</literal>の各列をベクトル
-            
             <literal>1:size(y,1)</literal>に対してプロットします.
-            
         </para>
-        
         <para>
-            
             プロットをカスタマイズするために引数<literal>&lt;opt_args&gt;</literal> を
-            
             使用することができます.
-            
         </para>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>logflag</term>
-                
                 <listitem>
-                    
                     <para>このオプションは,
-                        
                         軸スケール (線形または対数)を設定守るために使用できます.
-                        
                         値は文字列で, 以下の値のどれかを指定します:
-                        
                         <literal>"nn"</literal>,
-                        
                         <literal>"nl"</literal> , <literal>"ln"</literal> および
-                        
                         <literal>"ll"</literal>. <literal>"l"</literal> は
-                        
                         対数軸/目盛, <literal>"n"</literal>は通常の軸を意味します.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>style</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         このオプションは,曲線の描画方法を指定する際に使用できます.
-                        
                         このオプションを指定する場合,
-                        
                         値には曲線と同じ数のエントリを有するベクトルを指定します.
-                        
                     </para>
-                    
                     <itemizedlist>
-                        
                         <listitem>
-                            
                             <para>
-                                
                                 <literal>style(i)</literal> が正の場合,
-                                
                                 曲線は実線で描画され,
-                                
                                 <literal>style(i)</literal>は曲線の描画に使用される
-                                
                                 色の添字を定義します(<link linkend="getcolor">getcolor</link>参照).
-                                
                                 線のスタイルおよび太さはpolylineエンティティプロパティ
-                                
                                 (<link linkend="polyline_properties">polyline_properties</link>参照)
-                                
                                 により設定することができることに注意してください.
-                                
                             </para>
-                            
                             <para>指定した曲線の点の間は区分線形補間が行われます.</para>
-                            
                         </listitem>
-                        
                         <listitem>
-                            
                             <para>
-                                
                                 <literal>style(i)</literal>が負またはゼロの場合,
-                                
                                 指定した曲線の点はマーカにより描画されます,
-                                
                                 <literal>abs(style(i))</literal> は使用するマーカ id を定義します.
-                                
                                 マークの色および大きさはpolylineエンティティプロパティ
-                                
                                 (<link linkend="polyline_properties">polyline_properties</link>参照)
-                                
                                 により設定することができることに注意してください.
-                                
                             </para>
-                            
                         </listitem>
-                        
                     </itemizedlist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>strf</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         長さ <literal>"xyz"</literal> (デフォルトで
-                        
                         <literal>strf= "081"</literal>)の文字列.
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>x</term>
-                            
                             <listitem>
-                                
                                 <para>凡例の表示を制御します.</para>
-                                
                                 <variablelist>
-                                    
                                     <varlistentry>
-                                        
                                         <term>x=0</term>
-                                        
                                         <listitem>
-                                            
                                             <para>凡例なし.</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>x=1</term>
-                                        
                                         <listitem>
-                                            
                                             <para>凡例が表示されます.凡例は,
-                                                
                                                 オプションの引数 <literal>leg</literal>で指定されます.
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                 </variablelist>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>y</term>
-                            
                             <listitem>
-                                
                                 <para>指定した最小限の範囲に基づく実際の座標系の範囲の計算を
-                                    
                                     制御します. 実際の範囲は指定した最小限の範囲よりも大きくすることができます.
-                                    
                                 </para>
-                                
                                 <variablelist>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=0</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 計算せずに,以前のスケール(またはデフォルト)を
-                                                
                                                 プロットに使用します
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=1</term>
-                                        
                                         <listitem>
-                                            
                                             <para>rect引数による</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=2</term>
-                                        
                                         <listitem>
-                                            
                                             <para>x, y データの最小値/最大値による</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=3</term>
-                                        
                                         <listitem>
-                                            
                                             <para>rect引数に基づき等軸スケールで構築</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=4</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 x, y データの最小値/最大値に基づき等軸スケールで構築
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=5</term>
-                                        
                                         <listitem>
-                                            
                                             <para>rect引数に基づき見栄え良く軸を拡大</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=6</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 x, y データの最小値/最大値に基づき見栄え良く軸を拡大
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=7</term>
-                                        
                                         <listitem>
-                                            
                                             <para>y=1に似ていますが,
-                                                
                                                 前のプロットが新しいスケールを用いて再描画されます
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>y=8</term>
-                                        
                                         <listitem>
-                                            
                                             <para>y=2に似ていますが,
-                                                
                                                 前のプロットが新しいスケールを用いて再描画されます
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                 </variablelist>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>z</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     プロットの周囲のフレームへの情報の表示を制御します.
-                                    
                                     軸が指定された場合,目盛の数をオプションの引数
-                                    
                                     <literal>nax</literal>により指定できます.
-                                    
                                 </para>
-                                
                                 <variablelist>
-                                    
                                     <varlistentry>
-                                        
                                         <term>z=0</term>
-                                        
                                         <listitem>
-                                            
                                             <para>プロットの周囲に何も描画されません.</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>z=1</term>
-                                        
                                         <listitem>
-                                            
                                             <para>軸が描画され, y軸が左に表示されます.</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>z=2</term>
-                                        
                                         <listitem>
-                                            
                                             <para>プロットが目盛のない箱で囲まれます.</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>z=3</term>
-                                        
                                         <listitem>
-                                            
                                             <para>軸が描画され, y軸が右に表示されます.</para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>z=4</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 フレームボックスの中心に軸が描画されます.
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                     <varlistentry>
-                                        
                                         <term>z=5</term>
-                                        
                                         <listitem>
-                                            
                                             <para>
-                                                
                                                 点<literal>(0,0)</literal>で交差するように
-                                                
                                                 軸が描画されます.
-                                                
                                                 点<literal>(0,0)</literal>がフレーム内にない場合,
-                                                
                                                 グラフ上に軸は表示されません.
-                                                
                                             </para>
-                                            
                                         </listitem>
-                                        
                                     </varlistentry>
-                                    
                                 </variablelist>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>leg</term>
-                
                 <listitem>
-                    
                     <para>このオプションは曲線の凡例を設定する際に使用されます.
-                        
                         <literal>"leg1@leg2@...."</literal>という形式の文字列とする
-                        
                         必要があります.
-                        
                         ただし, <literal>leg1</literal> , <literal>leg2</literal> , ...
-                        
                         はそれぞれ最初の曲線,2番目の曲線,... の凡例です.
-                        
                         デフォルトは
-                        
                         <literal> " "</literal>です.
-                        
                     </para>
-                    
                     <para>曲線の凡例はx軸の下に描画されます.
-                        
                         このオプションは柔軟ではないため,なるべく,
-                        
                         <link linkend="captions">captions</link> または <link linkend="legend">legend</link> 関数を使用してください.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>rect</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         このオプションはプロット時に指定した最小限の範囲を設定する際に
-                        
                         使用できます.
-                        
                         このオプションが指定された場合,
-                        
                         値は以下の4個のエントリを有する実数ベクトルとする必要があります:
-                        
                     </para>
-                    
                     <para>
-                        
                         <literal>[xmin,ymin,xmax,ymax]</literal>.
-                        
                         <literal>xmin</literal> および <literal>xmax</literal> は横座標の範囲を定義し,
-                        
                         <literal>ymin</literal> および <literal>ymax</literal>は縦座標の範囲を定義します.
-                        
                     </para>
-                    
                     <para>
-                        
                         この引数は,指定した<literal>rect</literal>引数に基づき軸境界を
-                        
                         定義する方法を指定する<literal>frameflag</literal>オプションと共に
-                        
                         使用することができます.
-                        
                         <literal>frameflag</literal>オプションが指定されない場合,
-                        
                         <literal>frameflag=7</literal>が仮定されます.
-                        
                     </para>
-                    
                     <para>軸境界も軸エンティティプロパティによりカスタマイズできます
-                        
                         (<link linkend="axes_properties">axes_properties</link>参照).
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>nax</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         このオプションは軸ラベルおよび目盛定義を指定する際に使用できます.
-                        
                         値には4個の整数エントリ<literal>[nx,Nx,ny,Ny]</literal>を有する実数ベクトルを
-                        
                         指定します.
-                        
                     </para>
-                    
                     <para>
-                        
                         <literal>Nx</literal> はx軸で使用される主目盛の数
-                        
                         (autoticksの場合は-1を指定)を指定し,
-                        
                         <literal>nx</literal>は2つのx軸主目盛の間に描画される副目盛の
-                        
                         数を指定します.
-                        
                     </para>
-                    
                     <para>
-                        
                         <literal>Ny</literal> および <literal>ny</literal> は
-                        
                         y軸の同様な情報を指定します.
-                        
                     </para>
-                    
                     <para>
-                        
                         <literal>axesflag</literal> オプションが設定されない場合,
-                        
                         <literal>nax</literal> オプションは
-                        
                         <literal>axesflag</literal>オプションが9に設定されていると
-                        
                         仮定します.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>frameflag</term>
-                
                 <listitem>
-                    
                     <para>このオプションは指定された最小限の範囲に基づく実際の
-                        
                         座標系範囲の計算を制御するために使用できます.
-                        
                         実際の範囲は指定された最小限の範囲よりも大きくすることができます.
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=0</term>
-                            
                             <listitem>
-                                
                                 <para>計算せずに,以前のスケール(またはデフォルト)を
-                                    
                                     プロットに使用します.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=1</term>
-                            
                             <listitem>
-                                
                                 <para>実際の範囲は
-                                    
                                     <literal>rect</literal> オプションにより指定された範囲となります.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=2</term>
-                            
                             <listitem>
-                                
-                                <para>実際の範囲は 
-                                    
+                                <para>実際の範囲は
                                     <literal>x</literal> および<literal>y</literal> データの最小値/最大値から
-                                    
                                     計算されます.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=3</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     実際の範囲は<literal>rect</literal>オプションにより指定された範囲となり,
-                                    
                                     等軸スケールにするために拡大されます.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=4</term>
-                            
                             <listitem>
-                                
-                                <para>実際の範囲は 
-                                    
+                                <para>実際の範囲は
                                     <literal>x</literal> および<literal>y</literal> データの最小値/最大値から
-                                    
                                     計算され,等軸スケールにするために拡大されます.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=5</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     実際の範囲は<literal>rect</literal>オプションにより指定された範囲となり,
-                                    
                                     軸ラベルの見栄えを良くするために拡大されます.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=6</term>
-                            
                             <listitem>
-                                
-                                <para>実際の範囲は 
-                                    
+                                <para>実際の範囲は
                                     <literal>x</literal> および<literal>y</literal> データの最小値/最大値から
-                                    
                                     計算され,軸ラベルの見栄えを良くするために拡大されます.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=7</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     <literal>frameflag=1</literal>と似ていますが,
-                                    
                                     前のプロットが新しいスケールを用いて再描画されます.
-                                    
                                     カレントのグラフに前のプロットを追加するために使用されます.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=8</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     <literal>frameflag=2</literal>と似ていますが,
-                                    
                                     前のプロットが新しいスケールを用いて再描画されます.
-                                    
                                     カレントのグラフに前のプロットを追加するために使用されます.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>frameflag=9</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     <literal>frameflag=8</literal> と似ていますが,
-                                    
                                     範囲は軸ラベルの見栄えを良くするために拡大されます.
-                                    
                                     これはデフォルト値です.
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                     <para>軸の境界も軸エンティティプロパティによりカスタマイズできます
-                        
                         (s<link linkend="axes_properties">axes_properties</link>参照).
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>axesflag</term>
-                
                 <listitem>
-                    
                     <para>軸の描画方法を指定するためにこのオプションを指定することができます.
-                        
                         値には 0 から 5の範囲の整数を指定します :
-                        
                     </para>
-                    
                     <variablelist>
-                        
                         <varlistentry>
-                            
                             <term>axesflag=0</term>
-                            
                             <listitem>
-                                
                                 <para>プロットの周囲に何も描画されません (axes_visible=["off"
-                                    
                                     "off"];box="off").
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>axesflag=1</term>
-                            
                             <listitem>
-                                
                                 <para>軸が描画され, y軸が左に表示されます
-                                    
                                     (axes_visible=["on" "on"];box="on",y_location="left").
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>axesflag=2</term>
-                            
                             <listitem>
-                                
                                 <para>プロットは目盛のない箱で囲われます
-                                    
                                     (axes_visible=["off" "off"];box="on").
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>axesflag=3</term>
-                            
                             <listitem>
-                                
                                 <para>軸が描画され, y軸が右に表示されます
-                                    
                                     (axes_visible=["on"
-                                    
                                     "on"];box="off",y_location="right").
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>axesflag=4</term>
-                            
                             <listitem>
-                                
                                 <para>軸がフレームの中心に描画され,箱は描画されません
-                                    
                                     (axes_visible=["on" "on"];box="off",x_location="middle",
-                                    
                                     y_location="middle").
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>axesflag=5</term>
-                            
                             <listitem>
-                                
                                 <para>
-                                    
                                     <literal>axesflag=4</literal>に似た軸がフレームの中心に描画されます.
-                                    
                                     違いは箱が描画されることです
-                                    
                                     (axes_visible=["on" "on"];box="on",x_location="middle",y_location="middle").
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                         <varlistentry>
-                            
                             <term>axesflag=9</term>
-                            
                             <listitem>
-                                
                                 <para>軸が描画され, y軸が左に表示されます
-                                    
-                                    (axes_visible=["on" "on"];box="off",y_location="left"). 
-                                    
+                                    (axes_visible=["on" "on"];box="off",y_location="left").
                                     これがデフォルト値です
-                                    
                                 </para>
-                                
                             </listitem>
-                            
                         </varlistentry>
-                        
                     </variablelist>
-                    
                     <para>軸の特性も軸エンティティプロパティによりカスタマイズできます
-                        
                         (<link linkend="axes_properties">axes_properties</link>参照).
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>その他の情報</title>
-        
         <para>デフォルトで, 連続プロットは重ね書きされます. 前のプロットを
-            
             消去するには,
-            
             <literal>
-                
                 <link linkend="clf">clf()</link>
-                
             </literal>
-            
             を使用してください.
-            
         </para>
-        
         <para>
-            
             デモを参照するにはコマンド <literal>plot2d()</literal> を使用してください.
-            
         </para>
-        
         <para>その他に以下のような高レベルplot2d 関数が存在します:</para>
-        
         <itemizedlist>
-            
             <listitem>
-                
                 <para>
-                    
                     plot2d2 は <literal>plot2d</literal> と同じですが,曲線は
-                    
                     区分定数と仮定されます.
-                    
                 </para>
-                
             </listitem>
-            
             <listitem>
-                
                 <para>
-                    
                     plot2d3 は<literal>plot2d</literal> と同じですが, 曲線は
-                    
                     垂直棒グラフとしてプロットされます.
-                    
                 </para>
-                
             </listitem>
-            
             <listitem>
-                
                 <para>
-                    
                     plot2d4 は <literal>plot2d</literal> と同じですが, 曲線は
-                    
                     垂直な矢印をでプロットされます.
-                    
                 </para>
-                
             </listitem>
-            
         </itemizedlist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 // x 初期化
-
 x=[0:0.1:2*%pi]';
-
 //簡単なプロット
-
 plot2d(sin(x));
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(sin(x));
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 clf();
-
 x=[0:0.1:2*%pi]';
-
 plot2d(x,sin(x));
-
 //複数のプロット
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,sin(x));
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 clf();
-
 x=[0:0.1:2*%pi]';
-
 plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,[sin(x) sin(2*x) sin(3*x)])
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 // フレームの次元を指定した複数プロット
-
 clf();
-
 plot2d(x,[sin(x) sin(2*x) sin(3*x)],rect=[0,0,6,0.5]);
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,[sin(x) sin(2*x) sin(3*x)],rect=[0,0,6,0.5]);
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 //凡例と目盛/スタイルを指定した複数プロット
-
 clf();
-
 plot2d(x,[sin(x) sin(2*x) sin(3*x)],..
-
        [1,2,3],leg="L1@L2@L3",nax=[2,10,2,10],rect=[0,-2,2*%pi,2]);
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,[sin(x) sin(2*x) sin(3*x)],..
             [1,2,3],leg="L1@L2@L3",nax=[2,10,2,10],rect=[0,-2,2*%pi,2]);
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 // 等軸
-
 clf();
-
 plot2d(x,sin(x),1,frameflag= 4);
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,sin(x),1,frameflag= 4);
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
-// スケール 
-
+        <programlisting role="example"><![CDATA[
+// スケール
 clf();
-
 plot2d(x,sin(x),1,frameflag= 6);
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,sin(x),1,frameflag= 6);
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 // 前のプロット/スタイルでオートスケール
-
 clf();
-
 plot2d(x,sin(x),-1);
-
-plot2d(x,2*sin(x),12); 
-
+plot2d(x,2*sin(x),12);
 plot2d(2*x,cos(x),3);
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,sin(x),-1);
-            plot2d(x,2*sin(x),12); 
+            plot2d(x,2*sin(x),12);
             plot2d(2*x,cos(x),3);
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 // 軸を右に
-
 clf();
-
 plot2d(x,sin(x),leg="sin(x)");
-
-a=gca(); // 軸エンティティのハンドル 
-
+a=gca(); // 軸エンティティのハンドル
 a.y_location ="right";
-
  ]]></programlisting>
-        
         <scilab:image>
             x=[0:0.1:2*%pi]';
             plot2d(x,sin(x),leg="sin(x)");
-            a=gca(); // Handle on axes entity 
-            a.y_location ="right"; 
+            a=gca(); // Handle on axes entity
+            a.y_location ="right";
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
-
+        <programlisting role="example"><![CDATA[
 // 軸の中心を (0,0) に
-
 clf();
-
 plot2d(x-4,sin(x),1,leg="sin(x)");
-
 a=gca(); // 軸エンティティのハンドル
-
-a.x_location = "origin"; 
-
-a.y_location = "origin"; 
-
+a.x_location = "origin";
+a.y_location = "origin";
 // plot2dで作成されたエンティティを操作 ...
-
 a=gca();
-
-a.isoview='on'; 
-
+a.isoview='on';
 a.children // 軸の子の一覧.
-
-// 2個のポリラインと1個の凡例からなる複合要素がある 
-
+// 2個のポリラインと1個の凡例からなる複合要素がある
 poly1= a.children(1).children(1); //ポリラインのハンドルをpoly1に保存
-
 poly1.foreground = 4; // スタイルを変更する別の方法...
-
 poly1.thickness = 3;  // ...曲線の太さを変更.
-
 poly1.clip_state='off'; // クリッピングの制御
-
 leg = a.children(2); // 凡例のハンドルをlegに保存
-
-leg.font_style = 9; 
-
+leg.font_style = 9;
 leg.line_mode = "on";
-
 a.isoview='off';
-
  ]]></programlisting>
-        
         <scilab:image>
-            
-            // axis centered at (0,0) 
+            // axis centered at (0,0)
             clf();
             x=[0:0.1:2*%pi]';
             plot2d(x-4,sin(x),1,leg="sin(x)");
             a=gca(); // Handle on axes entity
-            a.x_location = "origin"; 
-            a.y_location = "origin"; 
+            a.x_location = "origin";
+            a.y_location = "origin";
             // Some operations on entities created by plot2d ...
             a=gca();
-            a.isoview='on'; 
+            a.isoview='on';
             a.children // list the children of the axes.
-            // There are a compound made of two polylines and a legend 
-            poly1= a.children(1).children(1); //store polyline handle into poly1 
+            // There are a compound made of two polylines and a legend
+            poly1= a.children(1).children(1); //store polyline handle into poly1
             poly1.foreground = 4; // another way to change the style...
             poly1.thickness = 3;  // ...and the thickness of a curve.
             poly1.clip_state='off'; // clipping control
             leg = a.children(2); // store legend handle into leg
-            leg.font_style = 9; 
+            leg.font_style = 9;
             leg.line_mode = "on";
             a.isoview='off';
         </scilab:image>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="plot">plot</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="plot2d1">plot2d1</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d2">plot2d2</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d3">plot2d3</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d4">plot2d4</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="clf">clf</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="xdel">xdel</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="delete">delete</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
diff --git a/scilab/modules/graphics/help/ja_JP/2d_plot/plot2d1.xml b/scilab/modules/graphics/help/ja_JP/2d_plot/plot2d1.xml
deleted file mode 100644 (file)
index a987e75..0000000
+++ /dev/null
@@ -1,354 +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="plot2d1">
-    
-    <refnamediv>
-        
-        <refname>plot2d1</refname>
-        
-        <refpurpose>
-            
-            2次元プロット (対数軸)
-            
-            <emphasis role="bold">この関数は廃止されました.</emphasis>
-            
-        </refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>Syntax</title>
-        
-        <synopsis>plot2d1(str,x,y,[style,strf,leg,rect,nax])</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>Parameters</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>str</term>
-                
-                <listitem>
-                    
-                    <para>
-                        
-                        is a string of length three <literal>"abc"</literal>.
-                        
-                    </para>
-                    
-                    <variablelist>
-                        
-                        <varlistentry>
-                            
-                            <term>a</term>
-                            
-                            <listitem>
-                                
-                                <para>
-                                    
-                                    can have the following values: <literal>e</literal>,
-                                    
-                                    <literal>o</literal> or <literal>g</literal>.
-                                    
-                                </para>
-                                
-                                <variablelist>
-                                    
-                                    <varlistentry>
-                                        
-                                        <term>e</term>
-                                        
-                                        <listitem>
-                                            
-                                            <para>means "empty". Itspecifies the fact that the value
-                                                
-                                                of <literal>x</literal> is not used (the <literal>x</literal> values
-                                                
-                                                are supposed to be regularly spaced, ie 1:&lt;number of
-                                                
-                                                rows of <literal>y</literal>&gt;). The user must anyway give a
-                                                
-                                                value for <literal>x</literal>, 1 for instance:
-                                                
-                                                <literal>plot2d1("enn",1,y)</literal>.
-                                                
-                                            </para>
-                                            
-                                        </listitem>
-                                        
-                                    </varlistentry>
-                                    
-                                    <varlistentry>
-                                        
-                                        <term>o</term>
-                                        
-                                        <listitem>
-                                            
-                                            <para>means "one". If there are many curves, they all
-                                                
-                                                have the same x-values: <literal>x</literal> is a column
-                                                
-                                                vector of size nl and <literal>y</literal> is a matrix of size
-                                                
-                                                (nl,nc). For example :
-                                                
-                                                <literal>x=[0:0.1:2*%pi]';plot2d1("onn",x,[sin(x) cos(x)])</literal>.
-                                                
-                                            </para>
-                                            
-                                        </listitem>
-                                        
-                                    </varlistentry>
-                                    
-                                    <varlistentry>
-                                        
-                                        <term>g</term>
-                                        
-                                        <listitem>
-                                            
-                                            <para>
-                                                
-                                                means "general". <literal>x</literal> and <literal>y</literal>
-                                                
-                                                must have the same size (nl,nc). Each column of
-                                                
-                                                <literal>y</literal> is plotted with respect to the
-                                                
-                                                corresponding column of <literal>x</literal>. <literal>nc</literal>
-                                                
-                                                curves are plotted using <literal>nl</literal> points.
-                                                
-                                            </para>
-                                            
-                                        </listitem>
-                                        
-                                    </varlistentry>
-                                    
-                                </variablelist>
-                                
-                            </listitem>
-                            
-                        </varlistentry>
-                        
-                        <varlistentry>
-                            
-                            <term>b, c</term>
-                            
-                            <listitem>
-                                
-                                <para>
-                                    
-                                    can have the values <literal>n</literal> (normal) or
-                                    
-                                    <literal>l</literal> (logarithmic).
-                                    
-                                </para>
-                                
-                                <variablelist>
-                                    
-                                    <varlistentry>
-                                        
-                                        <term>b=l</term>
-                                        
-                                        <listitem>
-                                            
-                                            <para>a logarithmic axis is used on the x-axis</para>
-                                            
-                                        </listitem>
-                                        
-                                    </varlistentry>
-                                    
-                                    <varlistentry>
-                                        
-                                        <term>c=l</term>
-                                        
-                                        <listitem>
-                                            
-                                            <para>a logarithmic axis is used on the y-axis</para>
-                                            
-                                        </listitem>
-                                        
-                                    </varlistentry>
-                                    
-                                </variablelist>
-                                
-                            </listitem>
-                            
-                        </varlistentry>
-                        
-                    </variablelist>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>x,y,[style,strf,leg,rect,nax]</term>
-                
-                <listitem>
-                    
-                    <para>these arguments have the same meaning as in the
-                        
-                        <literal>plot2d</literal> function.
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>opt_args</term>
-                
-                <listitem>
-                    
-                    <para>these arguments have the same meaning as in the
-                        
-                        <literal>plot2d</literal> function.
-                        
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>Description</title>
-        
-        <para>
-            
-            This function is obsolete. USE <literal>plot2d</literal> INSTEAD !!
-            
-        </para>
-        
-        <para>
-            
-            <literal>plot2d1</literal> plots a set of 2D curves. It is the same as
-            
-            <literal>plot2d</literal> but with one more argument <literal>str</literal> which
-            
-            enables logarithmic axis. Moreover, it allows to specify only one column
-            
-            vector for <literal>x</literal> when it is the same for all the curves.
-            
-        </para>
-        
-        <para>By default, successive plots are superposed. To clear the previous
-            
-            plot, use <literal>clf</literal>.
-            
-        </para>
-        
-        <para>
-            
-            Enter the command <literal>plot2d1()</literal> to see a demo.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>Examples</title>
-        
-        <programlisting role="example"><![CDATA[
-
-// multiple plot without giving x
-
-x=[0:0.1:2*%pi]';
-
-plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
-
-// multiple plot using only one x
-
-clf()
-
-plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
-
-// logarithmic plot
-
-x=[0.1:0.1:3]'; clf()
-
-plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
-
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>See Also</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="plot2d">plot2d</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="plot2d2">plot2d2</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="plot2d3">plot2d3</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="plot2d4">plot2d4</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="clf">clf</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
index 76908ec..7aab2dc 100644 (file)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) ENPC - Jean-Philippe Chancelier
-
  * 
-
-
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * and continues to be available under such terms.
  * For more information, see the COPYING file which you should have received
  * along with this program.
-
  *
-
  -->
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="plot2d3">
-    
     <refnamediv>
-        
         <refname>plot2d3</refname>
-        
         <refpurpose>2次元プロット (垂直棒グラフ)</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>plot2d3([logflags,] x,y,[style,strf,leg,rect,nax])
-            
             plot232(y)
-            
             plot2d3(x,y &lt;,opt_args&gt;)
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="parameters">
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>args</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         パラメータの説明については<literal>plot2d</literal> 参照.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>
-            
             <literal>plot2d3</literal> は<literal>plot2d</literal> と同じですが,
-            
             曲線が垂直棒グラフとしてプロットされます.
-            
         </para>
-        
         <para>デフォルトで, 連続するプロットは重ね描きされます.前のプロットを消去するには
-            
             <literal>clf()</literal>を使用してください.
-            
         </para>
-        
         <para>
-            
             コマンド <literal>plot2d3()</literal> を入力するとデモを参照できます.
-            
         </para>
-        
         <para>
-            
             <note>
-                
                 <literal>plot2dxx</literal> (xx = 1 から 4)により提供されるモードは全て
-                
                 <literal>plot2d</literal>を用いて,
-                
                 <literal>polyline_style</literal>オプションを対応する数字に設定することにより,
-                
                 有効にすることができます.
-                
             </note>
-            
         </para>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-
-// 以下を plot2d1と比較
-
-x=[0:0.1:2*%pi]';
-
-plot2d3(x,[sin(x) sin(2*x) sin(3*x)])
-
+        <programlisting role="example"><![CDATA[
+x = [0:0.1:2*%pi]';
+plot2d3(x, [sin(x) sin(2*x) sin(3*x)])
  ]]></programlisting>
-        
         <scilab:image>
-            
-            x=[0:0.1:2*%pi]';
-            
+            x = [0:0.1:2*%pi]';
             plot2d3(x,[sin(x) sin(2*x) sin(3*x)])
-            
         </scilab:image>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 clf()
-
-x=[0:0.1:2*%pi]';
-
+x = [0:0.1:2*%pi]';
 plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-
-e=gce();
-
+e = gce();
 e.children(1).polyline_style=3;
-
 e.children(2).polyline_style=3;
-
 e.children(3).polyline_style=3;
-
  ]]></programlisting>
-        
         <scilab:image>
-            
             x=[0:0.1:2*%pi]';
-            
             plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-            
             e=gce();
-            
             e.children(1).polyline_style=3;
-            
             e.children(2).polyline_style=3;
-            
             e.children(3).polyline_style=3;
-            
         </scilab:image>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="plot2d">plot2d</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d2">plot2d2</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d4">plot2d4</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="clf">clf</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="polyline_properties">polyline_properties</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
index 4c6ed27..43ec694 100644 (file)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) ENPC - Jean-Philippe Chancelier
-
- * 
-
-
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * and continues to be available under such terms.
  * For more information, see the COPYING file which you should have received
  * along with this program.
-
  *
-
  -->
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="plot2d4">
-    
     <refnamediv>
-        
         <refname>plot2d4</refname>
-        
         <refpurpose>2次元プロット (矢印形式)</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>plot2d4([logflag,] x,y,[style,strf,leg,rect,nax])
-            
             plot2d4(y)
-            
             plot2d4(x,y &lt;,opt_args&gt;)
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
     <refsection>
-        
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>args</term>
-                
                 <listitem>
-                    
                     <para>
-                        
                         パラメータの説明については<literal>plot2d</literal> 参照.
-                        
                     </para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
     <refsection>
-        
         <title>説明</title>
-        
         <para>
-            
             <literal>plot2d4</literal> は <literal>plot2d</literal> と同じですが,
-            
             曲線は矢印形式でプロットされます.これは,
-            
             位相空間でODEの解をプロットする際に有用です.
-            
         </para>
-        
         <para>デフォルトで, 連続するプロットは重ね描きされます.前のプロットを消去するには
-            
             <literal>clf()</literal>を使用してください.
-            
         </para>
-        
         <para>
-            
-            デモを参照するには,コマンド <literal>plot2d4()</literal>を入力してください. 
-            
+            デモを参照するには,コマンド <literal>plot2d4()</literal>を入力してください.
         </para>
-        
         <para>
-            
             <note>
-                
                 <literal>plot2dxx</literal> (xx = 1 から 4)により提供されるモードは全て
-                
                 <literal>plot2d</literal>を用いて,
-                
                 <literal>polyline_style</literal>オプションを対応する数字に設定することにより,
-                
                 有効にすることができます.
-                
             </note>
-            
         </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>サンプル</title>
-        
-        <scilab:image>plot2d4();</scilab:image>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        Demo: plot2d4();
+        <scilab:image>plot2d4();</scilab:image>
+        <programlisting role="example"><![CDATA[
 // plot2dを用いた場合と比較
-
-x=[0:0.1:2*%pi]';
-
+clf
+subplot(2,1,1)
+x = [0:0.1:2*%pi]';
 plot2d4(x,[sin(x) sin(2*x) sin(3*x)])
 
-clf()
-
+subplot(2,1,2)
 plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-
-e=gce();
-
-e.children(1).polyline_style=4;
-
-e.children(2).polyline_style=4;
-
-e.children(3).polyline_style=4;
-
+e = gce();
+e.children.polyline_style=4;
  ]]></programlisting>
-        
         <scilab:image>
-            
             x=[0:0.1:2*%pi]';
-            
             plot2d4(x,[sin(x) sin(2*x) sin(3*x)])
-            
         </scilab:image>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="fchamp">fchamp</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d">plot2d</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d2">plot2d2</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d3">plot2d3</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="subplot">subplot</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="clf">clf</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="polyline_properties">polyline_properties</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
index 1dec8ad..6cd31cb 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) 1992 - 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="graduate">
-    
     <refnamediv>
-        
         <refname>graduate</refname>
-        
         <refpurpose>見栄えの良い軸のグラデーション</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>[xi,xa,np]=graduate( xmi, xma,n1,n2)
-            
             [xi,xa,np]=graduate( xmi, xma)
-            
         </synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="parameters">
         <title>引数</title>
-        
         <variablelist>
-            
             <varlistentry>
-                
                 <term>xmi,xma</term>
-                
                 <listitem>
-                    
                     <para>実数スカラー</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>n1, n2</term>
-                
                 <listitem>
-                    
                     <para>デフォルト値 3,10の整数</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>xi, xa</term>
-                
                 <listitem>
-                    
                     <para>実数スカラー</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
             <varlistentry>
-                
                 <term>np</term>
-                
                 <listitem>
-                    
                     <para>整数</para>
-                    
                 </listitem>
-                
             </varlistentry>
-            
         </variablelist>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="description">
         <title>説明</title>
-        
         <para>
-            
             graduateは,以下の条件を満たすような
-            
             間隔の最小値<literal>[xi,xa]</literal>と目盛の数<literal>np</literal>
-            
             を探します:
-            
         </para>
-        
         <para>
-            
             <literal>xi &lt;= xmi &lt;= xma &lt;= xa</literal>
-            
         </para>
-        
         <para>
-            
             ある整数 <literal>n</literal>に関して<literal>k</literal>を
-            
             <literal>[1 3 5]</literal>とする時,
-            
             <literal>xa - xi / np  =  k(10^n)</literal>
-            
         </para>
-        
         <para>
-            
             <literal>n1 &lt; np &lt; n2</literal>
-            
         </para>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-
-y=(0:0.33:145.78)';
-
-clf();plot2d1('enn',0,y)
-
-[ymn,ymx,np]=graduate(min(y),max(y))
-
-rect=[1,ymn,prod(size(y)),ymx];
-
-clf();plot2d1('enn',0,y,1,'011',' ',rect,[10,3,10,np])
-
+        <programlisting role="example"><![CDATA[
+y = (0:0.33:145.78)';
+clf();
+subplot(1,2,1)
+plot2d(y)
+
+subplot(1,2,2)
+[ymn,ymx,np] = graduate(min(y), max(y))
+rect = [1, ymn, prod(size(y)),ymx];
+plot2d([], y, 1,'011',' ',rect,[10,3,10,np])
 ]]></programlisting>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="xsetech">xsetech</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="plot2d">plot2d</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
index 2d884e7..111bb78 100644 (file)
             
             <literal>plotframe</literal> is used with 2D plotting functions
             
-            <link linkend="plot2d">plot2d</link>, <link linkend="plot2d1">plot2d1</link>,... to set a graphics frame. It must be
+            <link linkend="plot2d">plot2d</link>, <link linkend="plot2d2">plot2d2</link>,... to set a graphics frame. It must be
             
             used before <literal>plot2d</literal> which should be invoked with the
             
index 7718132..743c1fd 100644 (file)
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) INRIA - Djalel Abdemouche
-
  * Copyright (C) INRIA - Fabrice Leray
-
- * 
-
-
+ *
  * 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="drawlater">
-    
     <refnamediv>
-        
         <refname>drawlater</refname>
-        
         <refpurpose>軸の子を不可視にする.</refpurpose>
-        
     </refnamediv>
-    
     <refsynopsisdiv>
-        
         <title>呼び出し手順</title>
-        
         <synopsis>drawlater()</synopsis>
-        
     </refsynopsisdiv>
-    
-    <refsection>
-        
+    <refsection role="decsription">
         <title>説明</title>
-        
         <para>この関数は,
-            
             プロットを行う関数のような高レベル関数をコールすることにより,
-            
             または既存のオブジェクトにプロパティを設定することにより,
-            
             次に作成されるグラフィックオブジェクト,
-            
             <literal>カレントの図</literal>にただちに
-            
             表示しない場合に使用されます.カレントの図の
-            
             <literal>immediate_drawing</literal>プロパティは
-            
             次の描画を延期するために<literal>'off'</literal>に設定されます.
-            
         </para>
-        
         <para>
-            
             この関数は特に<literal>drawnow</literal>関数と組み合わせて使用されます.
-            
         </para>
-        
         <para>
-            
             カレントの図の<literal>immediate_drawing</literal>を有効に戻すには,
-            
             <literal>drawnow</literal>関数を使用します.
-            
         </para>
-        
         <para>警告 :  drawlater と drawnow コールの間に, カレントの図が
-            
             変更される可能性があります.
-            
             このため, 使用に際しては注意を要します.
-            
         </para>
-        
     </refsection>
-    
-    <refsection>
-        
+    <refsection role="examples">
         <title>例</title>
-        
-        <programlisting role="example"><![CDATA[ 
-
+        <programlisting role="example"><![CDATA[
 //例1 :  軸を1つ / 図を1つ
-
-drawlater(); 
-
+drawlater();
 xfarc(.25,.55,.1,.15,0,64*360);
-
 xfarc(.55,.55,.1,.15,0,64*360);
-
-xfrect(.3,.8,.3,.2); 
-
-xfrect(.2,.7,.5,.2);  
-
+xfrect(.3,.8,.3,.2);
+xfrect(.2,.7,.5,.2);
 xfrect(.32,.78,.1,.1);
-
 xfrect(.44,.78,.14,.1);
-
 xfrect(-.2,.4,1.5,.8);
-
-xstring(0.33,.9,"A Scilab Car");    
-
+xstring(0.33,.9,"A Scilab Car");
 a=get("current_axes");
-
 a.children(1).font_size=4;
-
-a.children(1).font_style=4;  
-
+a.children(1).font_style=4;
 a.children(1).background=5;
-
 a.children(3).background=8;
-
-a.children(4).background=8; 
-
+a.children(4).background=8;
 a.children(5).background=17;
-
-a.children(6).background=17; 
-
+a.children(6).background=17;
 a.children(7).background=25;
-
 a.children(8).background=25;
-
-xclick();drawnow();
-
+xclick();
+drawnow();
 
 //例 2: 軸を2つ / 図を1つ
-
-
-
+clf
+subplot(211)
+drawlater    // what will be present in this axes will be displayed later
+plot2d       // nothing is displayed => feeds the graphical buffer
 subplot(212)
-
-a=gca();
-
-drawlater //この軸に描画されるものは後で表示されます
-
-plot2d // これらの軸と子に後で描画します...
-
-
-
-subplot(211) //警告: 軸を変更します
-
-plot2d1 // デフォルトの描画モード
-
-
-
-drawnow() // 全て可視
-
+plot3d
+drawnow      // the graphical buffer is flushed: all its contents become visible
  ]]></programlisting>
-        
     </refsection>
-    
     <refsection role="see also">
-        
         <title>参照</title>
-        
         <simplelist type="inline">
-            
             <member>
-                
                 <link linkend="get">get</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="set">set</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="drawnow">drawnow</link>
-                
             </member>
-            
             <member>
-                
                 <link linkend="graphics_entities">graphics_entities</link>
-                
             </member>
-            
         </simplelist>
-        
     </refsection>
-    
-</refentry>
-
+</refentry>
\ No newline at end of file
index 390b3b3..6c6cc8a 100644 (file)
     <refsection>
         <title>Mais Informações</title>
         <para>Por padrão, esboços sucessivos são superpostos. para limpar o esboço
-            anterior use 
+            anterior use
             <literal>
                 <link linkend="clf">clf()</link>
             </literal>
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 // inicialização de x
 x=[0:0.1:2*%pi]';
 //esboço simples
@@ -519,36 +519,36 @@ plot2d(x,[sin(x) sin(2*x) sin(3*x)],..
 // isovisualização
 clf();
 plot2d(x,sin(x),1,frameflag= 4);
-// escala 
+// escala
 clf();
 plot2d(x,sin(x),1,frameflag= 6);
 // auto-escala com esboços anteriores + estilo
 clf();
 plot2d(x,sin(x),-1);
-plot2d(x,2*sin(x),12); 
+plot2d(x,2*sin(x),12);
 plot2d(2*x,cos(x),3);
 // eixo à direita
 clf();
 plot2d(x,sin(x),leg="sin(x)");
 a=gca(); // manipulador da entidade Axes
-a.y_location ="right"; 
-// eixo centrado em (0,0) 
+a.y_location ="right";
+// eixo centrado em (0,0)
 clf();
 plot2d(x-4,sin(x),1,leg="sin(x)");
 a=gca(); // manipulador da entidade Axes
-a.x_location = "middle"; 
-a.y_location = "middle"; 
+a.x_location = "middle";
+a.y_location = "middle";
 // algumas operações sobre entidades criadas por plot2d ...
 a=gca();
-a.isoview='on'; 
+a.isoview='on';
 a.children // lista dos galhos dos eixos
-// há um Compound formado por duas poligonais e uma legenda 
-poly1= a.children(1).children(1); //armazena um manipulador de poligonal em poly1 
+// há um Compound formado por duas poligonais e uma legenda
+poly1= a.children(1).children(1); //armazena um manipulador de poligonal em poly1
 poly1.foreground = 4; // outra maneira de se mudar o estilo...
 poly1.thickness = 3;  // ...e a espessura de uma curva.
 poly1.clip_state='off'; // controle de recorte
 leg = a.children(2); // armazena manipulador de legenda em leg
-leg.font_style = 9; 
+leg.font_style = 9;
 leg.line_mode = "on";
 a.isoview='off';
  ]]></programlisting>
@@ -560,9 +560,6 @@ a.isoview='off';
                 <link linkend="plot">plot</link>
             </member>
             <member>
-                <link linkend="plot2d1">plot2d1</link>
-            </member>
-            <member>
                 <link linkend="plot2d2">plot2d2</link>
             </member>
             <member>
diff --git a/scilab/modules/graphics/help/pt_BR/2d_plot/plot2d1.xml b/scilab/modules/graphics/help/pt_BR/2d_plot/plot2d1.xml
deleted file mode 100644 (file)
index 6caec8c..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) ENPC - Jean-Philippe Chancelier
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="plot2d1" xml:lang="en">
-    <refnamediv>
-        <refname>plot2d1</refname>
-        <refpurpose>Esboço 2d em escala logarítmica (obsoleto)</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>plot2d1(str,x,y,[style,strf,leg,rect,nax])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>str</term>
-                <listitem>
-                    <para>
-                        string de comprimento 3 <literal>"abc"</literal>.
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>a</term>
-                            <listitem>
-                                <para>
-                                    pode ter um dos seguintes valores: <literal>e</literal>,
-                                    <literal>o</literal> ou <literal>g</literal>.
-                                </para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>e</term>
-                                        <listitem>
-                                            <para>significa "vazio". Especifica que o valor de
-                                                <literal>x</literal> não é utilizado (os valores de
-                                                <literal>x</literal> são supostos regularmente
-                                                espaçados, ie 1:&lt;número de linhas de
-                                                <literal>y</literal>&gt;). De qualquer forma, o usuário
-                                                deve fornecer o valor de <literal>x</literal>, 1 por
-                                                exemplo: <literal>plot2d1("enn",1,y)</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>o</term>
-                                        <listitem>
-                                            <para>significa "um". Se há várias curvas, todas possuem
-                                                o mesmo valor x: <literal>x</literal> é um vetor coluna
-                                                de tamanho n1 e <literal>y</literal> é uma matriz de
-                                                tamanho(nl,nc). Por exemplo:
-                                                <literal>x=[0:0.1:2*%pi]';plot2d1("onn",x,[sin(x)
-                                                    cos(x)])
-                                                </literal>
-                                                .
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>g</term>
-                                        <listitem>
-                                            <para>
-                                                significa"geral". <literal>x</literal> e
-                                                <literal>y</literal> devem ter o mesmo tamanho (nl,nc).
-                                                Cada coluna de <literal>y</literal> é esboçada em
-                                                relação à coluna correspondente de <literal>x</literal>.
-                                                <literal>nc</literal> curvas são esboçadas utilizando-se
-                                                <literal>nl</literal> pontos.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>b, c</term>
-                            <listitem>
-                                <para>
-                                    pode possuir valores <literal>n</literal> (normal) ou
-                                    <literal>l</literal> (logarítmico).
-                                </para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>b=l</term>
-                                        <listitem>
-                                            <para>um eixo logarítmico é utilizado em x </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>c=l</term>
-                                        <listitem>
-                                            <para>um eixo logarítmico é utilizado em y</para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>x,y,[style,strf,leg,rect,nax]</term>
-                <listitem>
-                    <para>estes argumentos possuem o mesmo significado que na função
-                        <literal>plot2d</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>opt_args</term>
-                <listitem>
-                    <para>estes argumentos possuem o mesmo significado que na função
-                        <literal>plot2d</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Esta função está obsoleta. Utilize <literal>plot2d</literal> ao
-            invés.
-        </para>
-        <para>
-            <literal>plot2d1</literal> esboça um conjunto de curvas 2d. É o
-            mesmo que <literal>plot2d</literal> mas com mais um argumento
-            <literal>str</literal> que habilita escala logarítmica. Ainda, permite
-            especificar apenas um vetor coluna para <literal>x</literal> quando é o
-            mesmo para todas as curvas.
-        </para>
-        <para>Por padrão, esboços sucessivos são superpostos. Para limpar o esboço
-            anterior, use <literal>clf</literal>.
-        </para>
-        <para>
-            Entre com o comando <literal>plot2d1()</literal> para visualizar uma
-            demonstração.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-// esboços múltiplos sem fornecer x
-x=[0:0.1:2*%pi]';
-plot2d1("enn",1,[sin(x) sin(2*x) sin(3*x)])
-// esboços múltiplos fornecendo apenas x
-clf()
-plot2d1("onn",x,[sin(x) sin(2*x) sin(3*x)])
-// esboço logarítmico
-x=[0.1:0.1:3]'; clf()
-plot2d1("oll",x,[exp(x) exp(x.^2) exp(x.^3)])
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="plot2d">plot2d</link>
-            </member>
-            <member>
-                <link linkend="plot2d2">plot2d2</link>
-            </member>
-            <member>
-                <link linkend="plot2d3">plot2d3</link>
-            </member>
-            <member>
-                <link linkend="plot2d4">plot2d4</link>
-            </member>
-            <member>
-                <link linkend="clf">clf</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 5535fb6..0b900d6 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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="plot2d3" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="plot2d3" xml:lang="pt">
     <refnamediv>
         <refname>plot2d3</refname>
-        <refpurpose>esboço 2d (barras veticais)</refpurpose>
+        <refpurpose>esboço 2d (barras veticais)</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>plot2d3([logflags,] x,y,[style,strf,leg,rect,nax])
             plot232(y)
             plot2d3(x,y &lt;,opt_args&gt;)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>args</term>
                 <listitem>
                     <para>
-                        ver <literal>plot2d</literal> para uma descrição dos
-                        parâmetros.
+                        ver <literal>plot2d</literal> para uma descrição dos
+                        parâmetros.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
-            <literal>plot2d3</literal> é o mesmo que <literal>plot2d</literal>
-            mas as curvas são esboçadas utilizando-se barras verticais.
+            <literal>plot2d3</literal> é o mesmo que <literal>plot2d</literal>
+            mas as curvas são esboçadas utilizando-se barras verticais.
         </para>
-        <para>Por padrão, esboços sucessivos são superpostos. Para limpar esboços
+        <para>Por padrão, esboços sucessivos são superpostos. Para limpar esboços
             anteriores, use <literal>clf()</literal>.
         </para>
         <para>
             Entre com o comando <literal>plot2d3()</literal> para visualizar uma
-            demonstração. Note que todos os modos propostos por
+            demonstração. Note que todos os modos propostos por
             <literal>plot2dxx</literal> (xx = 1 a 4) podem ser habilitados
             utilizando-se <literal>plot2d</literal> podem ser habilitados
-            utilizando-se <literal>polyline_style</literal> para o número
+            utilizando-se <literal>polyline_style</literal> para o número
             correspondente.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-// compare o seguinte com plot2d1
+        <programlisting role="example"><![CDATA[
+// compare o seguinte com plot2d
 x=[0:0.1:2*%pi]';
 plot2d3(x,[sin(x) sin(2*x) sin(3*x)])
-// no novo modo de gráficos apenas
+// no novo modo de gráficos apenas
 clf()
 plot2d(x,[sin(x) sin(2*x) sin(3*x)])
 e=gce();
@@ -73,7 +73,7 @@ e.children(3).polyline_style=3;
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="plot2d">plot2d</link>
index ad13896..f862dc8 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="plot2d4" xml:lang="en">
     <refnamediv>
         <refname>plot2d4</refname>
-        <refpurpose>esboço 2d (setas)</refpurpose>
+        <refpurpose>esboço 2d (setas)</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>plot2d4([logflag,] x,y,[style,strf,leg,rect,nax])
             plot2d4(y)
             plot2d4(x,y &lt;,opt_args&gt;)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>args</term>
                 <listitem>
                     <para>
-                        ver <literal>plot2d</literal> para uma descrição dos
-                        parâmetros.for a description of parameters.
+                        ver <literal>plot2d</literal> para uma descrição dos
+                        parâmetros.for a description of parameters.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
-            <literal>plot2d4</literal> é o mesmo que <literal>plot2d</literal>
-            mas as curvas são esboçadas utilizando-se setas. Isto pode ser útil para
-            se esboçar solulções de uma EDO (equação diferencial ordinária) em um
-            espaço fásico.
+            <literal>plot2d4</literal> é o mesmo que <literal>plot2d</literal>
+            mas as curvas são esboçadas utilizando-se setas. Isto pode ser útil para
+            se esboçar solulções de uma EDO (equação diferencial ordinária) em um
+            espaço fásico.
         </para>
-        <para>Por padrão, esboços sucessivos são superpostos. Para limpar o esboço
+        <para>Por padrão, esboços sucessivos são superpostos. Para limpar o esboço
             anterior, use <literal>clf()</literal>.
         </para>
         <para>
             Entre com o comando <literal>plot2d4()</literal> para visualizar uma
-            demonstração. Note que todos os modos propostos por
+            demonstração. Note que todos os modos propostos por
             <literal>plot2dxx</literal> (xx = 1 a 4) podem ser habilitados
-            utilizando-se <literal>plot2d</literal> e ajustando-se a opção
-            <literal>polyline_style</literal> para o número correspondente.
+            utilizando-se <literal>plot2d</literal> e ajustando-se a opção
+            <literal>polyline_style</literal> para o número correspondente.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-// compare o seguinte com plot2d1
-x=[0:0.1:2*%pi]';
+        <programlisting role="example"><![CDATA[
+// compare o seguinte com plot2d + .polyline_style=4
+clf
+subplot(2,1,1)
+x = [0:0.1:2*%pi]';
 plot2d4(x,[sin(x) sin(2*x) sin(3*x)])
- // apenas no novo modo gráfico
-clf()
+
+subplot(2,1,2)
 plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-e=gce();
-e.children(1).polyline_style=4;
-e.children(2).polyline_style=4;
-e.children(3).polyline_style=4;
+gce().children.polyline_style = 4;
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="fchamp">fchamp</link>
index f5e5994..f08c184 100644 (file)
@@ -2,7 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 1992 - INRIA - Serge Steer
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="graduate" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="graduate" xml:lang="pt">
     <refnamediv>
         <refname>graduate</refname>
-        <refpurpose>graduação de eixos</refpurpose>
+        <refpurpose>graduação de eixos</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[xi,xa,np]=graduate( xmi, xma,n1,n2)
             [xi,xa,np]=graduate( xmi, xma)
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
+    <refsection role="parameters">
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>xmi,xma</term>
@@ -36,7 +36,7 @@
             <varlistentry>
                 <term>n1, n2</term>
                 <listitem>
-                    <para>inteiros com valores padrões 3,10 </para>
+                    <para>inteiros com valores padrões 3,10 </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
-        <title>Descrição</title>
+    <refsection role="description">
+        <title>Descrição</title>
         <para>
-            graduate procura pelo intervalo mínimo <literal>[xi,xa]</literal> e
-            um número de tiques <literal>np</literal> tais que:
+            graduate procura pelo intervalo mínimo <literal>[xi,xa]</literal> e
+            um número de tiques <literal>np</literal> tais que:
         </para>
         <para>
             <literal>xi &lt;= xmi &lt;= xma &lt;= xa</literal>
             <literal>n1 &lt; np &lt; n2</literal>
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-y=(0:0.33:145.78)';
-clf();plot2d1('enn',0,y)
-[ymn,ymx,np]=graduate(min(y),max(y))
-rect=[1,ymn,prod(size(y)),ymx];
-clf();plot2d1('enn',0,y,1,'011',' ',rect,[10,3,10,np])
+        <programlisting role="example"><![CDATA[
+y = (0:0.33:145.78)';
+clf();
+subplot(1,2,1)
+plot2d(y)
+
+subplot(1,2,2)
+[ymn,ymx,np] = graduate(min(y), max(y))
+rect = [1, ymn, prod(size(y)),ymx];
+plot2d([], y, 1,'011',' ',rect,[10,3,10,np])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="xsetech">xsetech</link>
index 56072c8..d750d83 100644 (file)
         <title>Descrição</title>
         <para>
             <literal>plotframe</literal> é utilizado com funções de esboço 2d
-            <link linkend="plot2d">plot2d</link>, <link linkend="plot2d1">plot2d1</link>,... para ajustar uma moldura gráfica.
+            <link linkend="plot2d">plot2d</link>, <link linkend="plot2d2">plot2d2</link>,... para ajustar uma moldura gráfica.
             Deve ser usado antes de <literal>plot2d</literal> que deve ser chamado com
             o modo de superposição "000" .
         </para>
index c832c1d..32bf528 100644 (file)
@@ -3,7 +3,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Djalel Abdemouche
  * Copyright (C) INRIA - Fabrice Leray
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="drawlater" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="drawlater" xml:lang="pt">
     <refnamediv>
         <refname>drawlater</refname>
-        <refpurpose>Torna galhos dos eixos invisíveis.</refpurpose>
+        <refpurpose>Torna galhos dos eixos invisíveis.</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>drawlater()</synopsis>
     </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>Esta função pode ser utilizada para não se exibir imediatamente na
-            figura corrente os próximos objetos gráficos a serem criados por uma
-            chamada a funções de alto-nível tais como funções de esboço ou ajuste de
+    <refsection role="description">
+        <title>Descrição</title>
+        <para>Esta função pode ser utilizada para não se exibir imediatamente na
+            figura corrente os próximos objetos gráficos a serem criados por uma
+            chamada a funções de alto-nível tais como funções de esboço ou ajuste de
             propriedades de objetos existentes. A propriedade
-            <literal>immediate_drawing</literal> da figura corrente é ajustada para
-            <literal>'off'</literal> para se adiar os próximos desenhos.
+            <literal>immediate_drawing</literal> da figura corrente é ajustada para
+            <literal>'off'</literal> para se adiar os próximos desenhos.
         </para>
-        <para>Pode ser utilizada especialmente com a função</para>
+        <para>Pode ser utilizada especialmente com a função</para>
         <para>
             Para reabilitar <literal>immediate_drawing</literal> para a figura
-            corrente, você pode utilizar a função.
+            corrente, você pode utilizar a função.
         </para>
-        <para>Aviso: note que entre chamadas às funções drawlater e drawnow, a
-            figura corrente pode ser modificada. Logo, estas funções devem ser usadas
+        <para>Aviso: note que entre chamadas às funções drawlater e drawnow, a
+            figura corrente pode ser modificada. Logo, estas funções devem ser usadas
             com cuidado.
         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 //Exemplo 1:  uma entidade Axes / uma entidade Figure
-drawlater(); 
+drawlater();
 xfarc(.25,.55,.1,.15,0,64*360);
 xfarc(.55,.55,.1,.15,0,64*360);
-xfrect(.3,.8,.3,.2); 
-xfrect(.2,.7,.5,.2);  
+xfrect(.3,.8,.3,.2);
+xfrect(.2,.7,.5,.2);
 xfrect(.32,.78,.1,.1);
 xfrect(.44,.78,.14,.1);
 xfrect(-.2,.4,1.5,.8);
-xstring(0.33,.9,"A Scilab Car");    
+xstring(0.33,.9,"A Scilab Car");
 a=get("current_axes");
 a.children(1).font_size=4;
-a.children(1).font_style=4;  
+a.children(1).font_style=4;
 a.children(1).background=5;
 a.children(3).background=8;
-a.children(4).background=8; 
+a.children(4).background=8;
 a.children(5).background=17;
-a.children(6).background=17; 
+a.children(6).background=17;
 a.children(7).background=25;
 a.children(8).background=25;
-xclick();drawnow();
-//Exemplo 2: duas entidades Axes/ uma entidade Figure
+xclick();
+drawnow();
 
+//Exemplo 2: duas entidades Axes/ uma entidade Figure
+clf
+subplot(211)
+drawlater    // o que estará presente nestes eixos será desenhado depois
+plot2d       // nothing is displayed => feeds the graphical buffer
 subplot(212)
-a=gca();
-drawlater // o que estará presente nestes eixos será desenhado depois
-plot2d // desenhará estes eixos e seus galhos depois...
-
-subplot(211) // aviso: mudamos os eixos
-plot2d1 // modo de desenho padrão
-
-drawnow() // tudo está visível
+plot3d
+drawnow      // the graphical buffer is flushed: all its contents become visible
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="get">get</link>
index a3e8401..e690c78 100644 (file)
@@ -65,7 +65,6 @@ GRAPHICS_IMPEXP int sci_rubberbox(char *fname, void *pvApiCtx);
 GRAPHICS_IMPEXP int sci_rotate_axes(char *fname, void *pvApiCtx);
 GRAPHICS_IMPEXP int sci_plot3d(char *fname, void *pvApiCtx);
 GRAPHICS_IMPEXP int sci_plot2d1(char *fname, void *pvApiCtx);
-GRAPHICS_IMPEXP int sci_plot2d1_1(char *fname, void *pvApiCtx);
 GRAPHICS_IMPEXP int sci_plot2d1_2(char *fname, void *pvApiCtx);
 GRAPHICS_IMPEXP int sci_plot2d1_3(char *fname, void *pvApiCtx);
 GRAPHICS_IMPEXP int sci_plot2d1_4(char *fname, void *pvApiCtx);
diff --git a/scilab/modules/graphics/macros/%_plot2d1.sci b/scilab/modules/graphics/macros/%_plot2d1.sci
deleted file mode 100644 (file)
index 0bf0f11..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO - Jean-Baptiste Silvy
-//
-// 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.
-//
-//
-
-//
-// This is the demonstration script of plot2d1
-// used when calling plot2d1 without any parameter.
-//
-
-function [] = %_plot2d1()
-    x=(0:0.1:2*%pi)';
-    plot2d1(x, [sin(x),sin(2*x),sin(3*x)], style=[1,2,3], rect=[0,-2,2*%pi,2]);
-endfunction
index 64b70b4..9380fe9 100644 (file)
@@ -26,11 +26,14 @@ function [xi,xa,np]=graduate( xmi, xma,n1,n2)
     //           xa - xi / np  =  k(10**n)  k in [1 3 5]   for an integer n
     //           n1 <= np <= n2
     //%Exemple
-    //  y=0:0.33:145.78
-    //  clf();plot2d1('enn',0,y)