help pages misc. improvements + other typos 41/19641/31
Samuel GOUGEON [Thu, 4 Jan 2018 15:50:18 +0000 (16:50 +0100)]
 * DEL plot3d_patch.png plot3d_patch_vertex.png:
     no longer used (checked). Replaced with <scilab:image>

 * DEL bode.xml bode_asymp.xml cspect.xml pspect.xml:
     pure english versions miscopied in other lang="#"

Change-Id: I7405e0c4cda28c661aa44ba99850bad61f684557

98 files changed:
scilab/modules/cacsd/help/en_US/control_design/h_infinity/h2norm.xml
scilab/modules/cacsd/help/en_US/linear_analysis/freq_domain/bode.xml
scilab/modules/cacsd/help/en_US/linear_analysis/freq_domain/bode_asymp.xml
scilab/modules/cacsd/help/en_US/linear_system_representation/zpk.xml
scilab/modules/cacsd/help/fr_FR/linear_analysis/freq_domain/bode.xml [deleted file]
scilab/modules/cacsd/help/fr_FR/linear_analysis/freq_domain/bode_asymp.xml
scilab/modules/cacsd/help/ja_JP/control_design/h_infinity/h2norm.xml
scilab/modules/cacsd/help/ja_JP/linear_analysis/freq_domain/bode.xml
scilab/modules/cacsd/help/ja_JP/linear_analysis/freq_domain/bode_asymp.xml
scilab/modules/cacsd/help/pt_BR/linear_analysis/freq_domain/bode.xml [deleted file]
scilab/modules/cacsd/help/pt_BR/linear_analysis/freq_domain/bode_asymp.xml [deleted file]
scilab/modules/cacsd/help/ru_RU/linear_analysis/freq_domain/bode.xml [deleted file]
scilab/modules/cacsd/help/ru_RU/linear_analysis/freq_domain/bode_asymp.xml [deleted file]
scilab/modules/core/help/en_US/1_keywords/colon.xml
scilab/modules/core/help/en_US/1_keywords/comments.xml
scilab/modules/core/help/en_US/1_keywords/hat.xml
scilab/modules/core/help/en_US/scilab.xml
scilab/modules/core/help/fr_FR/1_keywords/colon.xml
scilab/modules/core/help/fr_FR/1_keywords/comments.xml
scilab/modules/core/help/fr_FR/1_keywords/hat.xml
scilab/modules/core/help/fr_FR/scilab.xml
scilab/modules/core/help/ja_JP/1_keywords/colon.xml
scilab/modules/core/help/ja_JP/1_keywords/comments.xml
scilab/modules/core/help/pt_BR/1_keywords/colon.xml
scilab/modules/core/help/pt_BR/1_keywords/comments.xml
scilab/modules/core/help/ru_RU/1_keywords/colon.xml
scilab/modules/core/help/ru_RU/1_keywords/comments.xml
scilab/modules/data_structures/help/en_US/type.xml
scilab/modules/data_structures/help/fr_FR/type.xml
scilab/modules/data_structures/help/ja_JP/type.xml
scilab/modules/data_structures/help/pt_BR/type.xml
scilab/modules/data_structures/help/ru_RU/type.xml
scilab/modules/differential_equations/help/en_US/daskr.xml
scilab/modules/differential_equations/help/fr_FR/daskr.xml
scilab/modules/differential_equations/help/ja_JP/daskr.xml
scilab/modules/elementary_functions/help/en_US/exponential/power.xml
scilab/modules/elementary_functions/help/en_US/issquare.xml
scilab/modules/elementary_functions/help/en_US/searchandsort/gsort.xml
scilab/modules/elementary_functions/help/fr_FR/exponential/power.xml
scilab/modules/elementary_functions/help/fr_FR/searchandsort/gsort.xml
scilab/modules/elementary_functions/help/ja_JP/issquare.xml
scilab/modules/elementary_functions/help/ja_JP/searchandsort/gsort.xml
scilab/modules/elementary_functions/help/pt_BR/searchandsort/gsort.xml
scilab/modules/elementary_functions/help/ru_RU/searchandsort/gsort.xml
scilab/modules/fileio/help/en_US/directory/isdir.xml
scilab/modules/fileio/help/en_US/fileinfo.xml
scilab/modules/fileio/help/ja_JP/fileinfo.xml
scilab/modules/fileio/help/pt_BR/fileinfo.xml
scilab/modules/fileio/help/ru_RU/fileinfo.xml
scilab/modules/functions/help/en_US/libraries/libraryinfo.xml
scilab/modules/functions/help/ja_JP/libraries/libraryinfo.xml
scilab/modules/functions/help/pt_BR/libraries/libraryinfo.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/en_US/axes_operations/xsetech.xml [moved from scilab/modules/graphics/help/en_US/xsetech.xml with 100% similarity]
scilab/modules/graphics/help/en_US/axis/graduate.xml [moved from scilab/modules/graphics/help/en_US/axes_operations/graduate.xml with 100% similarity]
scilab/modules/graphics/help/en_US/axis/xgraduate.xml [moved from scilab/modules/graphics/help/en_US/xgraduate.xml with 100% similarity]
scilab/modules/graphics/help/en_US/geometric_shapes/segs_properties.xml [moved from scilab/modules/graphics/help/en_US/segs_properties.xml with 99% similarity]
scilab/modules/graphics/help/en_US/geometric_shapes/xsegs.xml [moved from scilab/modules/graphics/help/en_US/xsegs.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/axes_operations/xsetech.xml [moved from scilab/modules/graphics/help/fr_FR/xsetech.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/axis/graduate.xml [moved from scilab/modules/graphics/help/fr_FR/axes_operations/graduate.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/axis/xgraduate.xml [moved from scilab/modules/graphics/help/fr_FR/xgraduate.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/geometric_shapes/xsegs.xml [moved from scilab/modules/graphics/help/fr_FR/xsegs.xml with 100% similarity]
scilab/modules/graphics/help/images/plot3d_patch.png [deleted file]
scilab/modules/graphics/help/images/plot3d_patch_vertex.png [deleted file]
scilab/modules/graphics/help/ja_JP/axes_operations/axes_properties.xml
scilab/modules/graphics/help/ja_JP/axes_operations/xsetech.xml [moved from scilab/modules/graphics/help/ja_JP/xsetech.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/axis/graduate.xml [moved from scilab/modules/graphics/help/ja_JP/axes_operations/graduate.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/axis/xgraduate.xml [moved from scilab/modules/graphics/help/ja_JP/xgraduate.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/geometric_shapes/segs_properties.xml [moved from scilab/modules/graphics/help/ja_JP/segs_properties.xml with 99% similarity]
scilab/modules/graphics/help/ja_JP/geometric_shapes/xsegs.xml [moved from scilab/modules/graphics/help/ja_JP/xsegs.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/axes_operations/xsetech.xml [moved from scilab/modules/graphics/help/pt_BR/xsetech.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/axis/graduate.xml [moved from scilab/modules/graphics/help/pt_BR/axes_operations/graduate.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/axis/xgraduate.xml [moved from scilab/modules/graphics/help/pt_BR/xgraduate.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/geometric_shapes/xsegs.xml [moved from scilab/modules/graphics/help/pt_BR/xsegs.xml with 100% similarity]
scilab/modules/graphics/macros/legend.sci
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/bode_ja_JP_3.png [new file with mode: 0644]
scilab/modules/helptools/images/bode_pt_BR_1.png
scilab/modules/helptools/images/bode_pt_BR_2.png
scilab/modules/helptools/images/bode_pt_BR_3.png [new file with mode: 0644]
scilab/modules/m2sci/help/en_US/m2sci_equivalents/operators/power.xml
scilab/modules/optimization/help/en_US/neldermead/neldermead_overview.xml
scilab/modules/optimization/help/en_US/optimsimplex/optimsimplex_overview.xml
scilab/modules/polynomials/help/en_US/ldiv.xml
scilab/modules/polynomials/help/en_US/pdiv.xml
scilab/modules/polynomials/help/fr_FR/ldiv.xml
scilab/modules/polynomials/help/fr_FR/pdiv.xml
scilab/modules/polynomials/help/ja_JP/ldiv.xml
scilab/modules/polynomials/help/ja_JP/pdiv.xml
scilab/modules/polynomials/help/pt_BR/ldiv.xml
scilab/modules/polynomials/help/pt_BR/pdiv.xml
scilab/modules/preferences/help/en_US/prefs_SciNotes.xml
scilab/modules/preferences/help/ja_JP/prefs_SciNotes.xml
scilab/modules/signal_processing/help/en_US/spectral_estimation/cspect.xml
scilab/modules/signal_processing/help/en_US/spectral_estimation/pspect.xml
scilab/modules/signal_processing/help/fr_FR/spectral_estimation/cspect.xml [deleted file]
scilab/modules/signal_processing/help/fr_FR/spectral_estimation/pspect.xml [deleted file]
scilab/modules/special_functions/help/en_US/beta.xml

index 2414a57..e45ecd5 100644 (file)
@@ -61,7 +61,8 @@
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-    h=syslin('c',(2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
+    s = %s;
+    h = syslin('c',(2*0.9*10*s+100) / (s^2+2*0.3*10.1*s+102.01));
     h2norm(h)
     ]]></programlisting>
     </refsection>
index 1719712..d3a4b14 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode" 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="bode" xml:lang="en">
     <refnamediv>
         <refname>bode</refname>
         <refpurpose>Bode plot</refpurpose>
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            bode(sl, [fmin, fmax] [,step] [,comments] )
-            bode(sl, [fmin, fmax] [,step] [,comments] [,"rad"] )
-            bode(sl, frq [,comments] )
-            bode(sl, frq [,comments] [,"rad"] )
-            bode(frq, db, phi [,comments] )
-            bode(frq, repf [,comments] [,"rad"] )
+            bode(sl)
+            bode(sl, fmin, fmax)
+            bode(sl, fmin, fmax, step)
+            bode(sl, frq)
+            bode(frq, db, phi)
+            bode(frq, repf)
+            bode(.., Captions)
+            bode(.., Captions, "rad")
         </synopsis>
     </refsynopsisdiv>
     <refsection>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>comments</term>
-                <listitem>
-                    <para>vector of character strings (captions).</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>frq</term>
                 <listitem>
                     <para>row vector or matrix (frequencies (in Hz) ) (one row for each
                 </listitem>
             </varlistentry>
             <varlistentry>
+                <term>Captions</term>
+                <listitem>
+                    <para>vector of character strings (captions).</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>"rad"</term>
                 <listitem>
-                    <para>converts the frequency from Hz into rad/s (multiplies by 2&#960;),
+                    <para>converts the frequency from Hz into rad/s (multiplies by 2π),
                     </para>
                 </listitem>
             </varlistentry>
             (see <literal>calfrq</literal> for the choice of default value).
         </para>
         <para>
-            <literal>comments</literal> is a vector of character strings
-            (captions).
-        </para>
-        <para>
             <literal>db,phi</literal> are the matrices of modulus (in Db) and
             phases (in degrees). (One row for each response).
         </para>
@@ -240,6 +241,12 @@ clf(); bode(sys, f_min, f_max, "rad"); // Converts Hz to rad/s
         <title>History</title>
         <revhistory>
             <revision>
+                <revnumber>5.5.0</revnumber>
+                <revdescription>
+                  <para><literal>"rad"</literal> option added.</para>
+                </revdescription>
+            </revision>
+            <revision>
                 <revnumber>6.0</revnumber>
                 <revdescription>
                     <para>handling zpk representation</para>
index 4db330c..22ab29a 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode_asymp" 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="bode_asymp" xml:lang="en">
     <refnamediv>
         <refname>bode_asymp</refname>
         <refpurpose>Bode plot asymptote</refpurpose>
@@ -22,7 +25,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            bode_asymp(sl, [wmin, wmax])
+            bode_asymp(sl)
+            bode_asymp(sl, wmin, wmax)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 18e7468..0ea8813 100644 (file)
@@ -9,16 +9,21 @@
  * 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="zpk">
+<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="zpk">
     <refnamediv>
         <refname>zpk</refname>
         <refpurpose>Zero pole gain system representation</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>S=zpk(Z,P,K,dt)</synopsis>
-        <synopsis> S=zpk(z,p,k,dt))</synopsis>
-        <synopsis>S=zpk(sys))</synopsis>
+        <synopsis>
+          S = zpk(Z,P,K,dt)
+          S = zpk(z,p,k,dt)
+          S = zpk(sys)
+         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
diff --git a/scilab/modules/cacsd/help/fr_FR/linear_analysis/freq_domain/bode.xml b/scilab/modules/cacsd/help/fr_FR/linear_analysis/freq_domain/bode.xml
deleted file mode 100644 (file)
index 59cd69e..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode" xml:lang="fr">
-    <refnamediv>
-        <refname>bode</refname>
-        <refpurpose>Bode plot</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            bode(sl, [fmin, fmax] [,step] [,comments] )
-            bode(sl, [fmin, fmax] [,step] [,comments] [,"rad"] )
-            bode(sl, frq [,comments] )
-            bode(sl, frq [,comments] [,"rad"] )
-            bode(frq, db, phi [,comments] )
-            bode(frq, repf [,comments] [,"rad"] )
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>sl</term>
-                <listitem>
-                    <para>
-                        <literal>syslin</literal> list (SISO or SIMO linear system)
-                        in continuous or discrete time.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>fmin,fmax</term>
-                <listitem>
-                    <para>real (frequency bounds (in Hz))</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>step</term>
-                <listitem>
-                    <para>real (logarithmic step.)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>comments</term>
-                <listitem>
-                    <para>vector of character strings (captions).</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>frq</term>
-                <listitem>
-                    <para>row vector or matrix (frequencies (in Hz) ) (one row for each
-                        SISO subsystem).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>db</term>
-                <listitem>
-                    <para>row vector or matrix ( magnitudes (in Db)). (one row for each
-                        SISO subsystem).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>phi</term>
-                <listitem>
-                    <para>row vector or matrix ( phases (in degree)) (one row for each
-                        SISO subsystem).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>repf</term>
-                <listitem>
-                    <para>row vector or matrix of complex numbers (complex frequency
-                        response).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>"rad"</term>
-                <listitem>
-                    <para>converts the frequency from Hz into rad/s (multiplies by 2&#960;),
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>Bode plot, i.e magnitude and phase of the frequency response of
-            <literal>sl</literal>.
-        </para>
-        <para>
-            <literal>sl</literal> can be a continuous-time or discrete-time SIMO
-            system (see <literal>syslin</literal>). In case of multi-output the
-            outputs are plotted with different symbols.
-        </para>
-        <para>
-            The frequencies are given by the bounds <literal>fmin,fmax</literal>
-            (in Hz) or by a row-vector (or a matrix for multi-output)
-            <literal>frq</literal>.
-        </para>
-        <para>
-            <literal>step</literal> is the ( logarithmic ) discretization step.
-            (see <literal>calfrq</literal> for the choice of default value).
-        </para>
-        <para>
-            <literal>comments</literal> is a vector of character strings
-            (captions).
-        </para>
-        <para>
-            <literal>db,phi</literal> are the matrices of modulus (in Db) and
-            phases (in degrees). (One row for each response).
-        </para>
-        <para>
-            <literal>repf</literal> matrix of complex numbers. One row for each
-            response.
-        </para>
-        <para>
-            Default values for <literal>fmin</literal> and
-            <literal>fmax</literal> are <literal>1.d-3</literal>,
-            <literal>1.d+3</literal> if <literal>sl</literal> is continuous-time or
-            <literal>1.d-3</literal>, <literal>0.5</literal>/sl.dt (nyquist frequency)
-            if <literal>sl</literal> is discrete-time. Automatic discretization of
-            frequencies is made by <literal>calfrq</literal>.
-        </para>
-        <para>
-            The
-            <link linkend="datatips">datatips</link>
-            tool may be used
-            to display data along the phase and modulus curves.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-s = poly(0, 's');
-h = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-
-clf(); bode(h, 0.01, 100);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, 's');
-                h = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                clf(); bode(h, 0.01, 100);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = poly(0, 's');
-h1 = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-num = 22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
-den = 22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4;
-h2 = syslin('c', num/den);
-
-clf(); bode([h1; h2], 0.01, 100, ['h1'; 'h2']);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, 's');
-                h1 = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                num = 22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
-                den = 22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4;
-                h2 = syslin('c', num/den);
-                clf(); bode([h1; h2], 0.01, 100, ['h1'; 'h2']);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = %s;
-G = (10*(s+3))/(s*(s+2)*(s^2+s+2)); // A rational matrix
-sys = syslin('c', G); // A continuous-time linear system in transfer matrix representation.
-f_min = .0001; f_max = 16; // Frequencies in Hz
-
-clf(); bode(sys, f_min, f_max, "rad"); // Converts Hz to rad/s
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = %s;
-                G = (10*(s+3))/(s*(s+2)*(s^2+s+2)); // A rational matrix
-                sys = syslin('c', G); // A continuous-time linear system in transfer matrix representation.
-                f_min = .0001; f_max = 16; // Frequencies in Hz
-                clf(); bode(sys, f_min, f_max, "rad"); // Converts Hz to rad/s
-            </scilab:image>
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="bode_asymp">bode_asymp</link>
-            </member>
-            <member>
-                <link linkend="black">black</link>
-            </member>
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="gainplot">gainplot</link>
-            </member>
-            <member>
-                <link linkend="repfreq">repfreq</link>
-            </member>
-            <member>
-                <link linkend="g_margin">g_margin</link>
-            </member>
-            <member>
-                <link linkend="p_margin">p_margin</link>
-            </member>
-            <member>
-                <link linkend="calfrq">calfrq</link>
-            </member>
-            <member>
-                <link linkend="phasemag">phasemag</link>
-            </member>
-            <member>
-                <link linkend="datatips">datatips</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index e5cad1f..b3995a6 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode_asymp" xml:lang="fr">
+<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="bode_asymp" xml:lang="fr">
     <refnamediv>
         <refname>bode_asymp</refname>
         <refpurpose>asymptote de diagramme de Bode</refpurpose>
@@ -22,7 +25,8 @@
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
         <synopsis>
-            bode_asymp(sl, [wmin, wmax])
+            bode_asymp(sl)
+            bode_asymp(sl, wmin, wmax)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index de5877e..58b269b 100644 (file)
@@ -63,7 +63,8 @@
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-    h=syslin('c',(2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
+    s = %s;
+    h = syslin('c', (2*0.9*10*s+100) / (s^2+2*0.3*10.1*s+102.01));
     h2norm(h)
     ]]></programlisting>
     </refsection>
index bf0e0a2..42560eb 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode" xml:lang="ja">
+<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="bode" xml:lang="ja">
     <refnamediv>
         <refname>bode</refname>
         <refpurpose>ボード線図</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>bode(sl,[fmin,fmax] [,step] [,comments] )
-            bode(sl,frq [,comments] )
-            bode(frq,db,phi [,comments])
-            bode(frq, repf [,comments])
+        <synopsis>
+            bode(sl)
+            bode(sl, fmin, fmax)
+            bode(sl, fmin, fmax, step)
+            bode(sl, frq)
+            bode(frq, db, phi)
+            bode(frq, repf)
+            bode(.., Captions)
+            bode(.., Captions, "rad")
         </synopsis>
     </refsynopsisdiv>
     <refsection>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>comments</term>
-                <listitem>
-                    <para>文字列のベクトル (キャプション).</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>frq</term>
                 <listitem>
                     <para>行ベクトルまたは行列 (周波数 (単位:Hz) )
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>Captions</term>
+                <listitem>
+                    <para>文字列のベクトル (キャプション).</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>"rad"</term>
+                <listitem>
+                    <para>converts the frequency from Hz into rad/s (multiplies by 2π)
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
             (デフォルト値の選定方法については,<literal>calfrq</literal> を参照).
         </para>
         <para>
-            <literal>comments</literal> は文字列ベクトル(キャプション)です.
-        </para>
-        <para>
             <literal>db,phi</literal> はゲイン(単位:dB)及び
             位相(単位:度)の行列です(各行が各応答に対応します).
         </para>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-s=poly(0,'s')
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-clf();bode(h,0.01,100);
+s = poly(0, 's');
+h = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
+
+clf
+bode(h, 0.01, 100);
  ]]></programlisting>
         <para>
             <scilab:image localized="true">
@@ -153,12 +167,14 @@ clf();bode(h,0.01,100);
             </scilab:image>
         </para>
         <programlisting role="example"><![CDATA[
-s=poly(0,'s')
-h1=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-num=22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
-den=22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4
-h2=syslin('c',num/den);
-clf();bode([h1;h2],0.01,100,['h1';'h2'])
+s = poly(0, 's');
+h1 = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
+num = 22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
+den = 22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4;
+h2 = syslin('c', num/den);
+
+clf
+bode([h1; h2], 0.01, 100, ['h1'; 'h2']);
  ]]></programlisting>
         <para>
             <scilab:image localized="true">
@@ -168,6 +184,24 @@ clf();bode([h1;h2],0.01,100,['h1';'h2'])
                 den=22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4
                 h2=syslin('c',num/den);
                 clf();bode([h1;h2],0.01,100,['h1';'h2'])
+             </scilab:image>
+        </para>
+        <programlisting role="example"><![CDATA[
+s = %s;
+G = (10*(s+3)) / (s*(s+2)*(s^2+s+2)); // A rational matrix
+sys = syslin('c', G); // A continuous-time linear system in transfer matrix representation.
+f_min = .0001; f_max = 16; // Frequencies in Hz
+
+clf
+bode(sys, f_min, f_max, "rad"); // Converts Hz to rad/s
+ ]]></programlisting>
+        <para>
+            <scilab:image localized="true">
+                s = %s;
+                G = (10*(s+3))/(s*(s+2)*(s^2+s+2)); // A rational matrix
+                sys = syslin('c', G); // A continuous-time linear system in transfer matrix representation.
+                f_min = .0001; f_max = 16; // Frequencies in Hz
+                clf(); bode(sys, f_min, f_max, "rad"); // Converts Hz to rad/s
             </scilab:image>
         </para>
     </refsection>
@@ -203,4 +237,21 @@ clf();bode([h1;h2],0.01,100,['h1';'h2'])
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revdescription>
+                  <para><literal>"rad"</literal> option added.</para>
+                </revdescription>
+            </revision>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <para>handling zpk representation</para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index d64e9f9..e46602c 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode_asymp" xml:lang="ja">
+<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="bode_asymp" xml:lang="ja">
     <refnamediv>
         <refname>bode_asymp</refname>
         <refpurpose>ボード線図の漸近線</refpurpose>
@@ -22,7 +25,8 @@
     <refsynopsisdiv>
         <title>呼び出し手順</title>
         <synopsis>
-            bode_asymp(sl, [wmin, wmax])
+            bode_asymp(sl)
+            bode_asymp(sl, wmin, wmax)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
diff --git a/scilab/modules/cacsd/help/pt_BR/linear_analysis/freq_domain/bode.xml b/scilab/modules/cacsd/help/pt_BR/linear_analysis/freq_domain/bode.xml
deleted file mode 100644 (file)
index 5659595..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode" xml:lang="pt">
-    <refnamediv>
-        <refname>bode</refname>
-        <refpurpose>diagrama de Bode</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>bode(sl,[fmin,fmax] [,step] [,comments] )
-            bode(sl,frq [,comments] )
-            bode(frq,db,phi [,comments])
-            bode(frq, repf [,comments])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>sl</term>
-                <listitem>
-                    <para>
-                        <literal>syslin</literal> lista (sistema linear SISO ou
-                        SIMO) em tempo contínuo ou discreto
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>fmin,fmax</term>
-                <listitem>
-                    <para>real (limites de freqüência (em Hz)) </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>step</term>
-                <listitem>
-                    <para>real (passo logarítmico.) </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>comments</term>
-                <listitem>
-                    <para>vetor de strings (legendas). </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>frq</term>
-                <listitem>
-                    <para>vetor linha ou matriz (freqüências (em Hz) ) (uma linha para
-                        cada subsistema SISO).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>db</term>
-                <listitem>
-                    <para>vetor linha ou matriz ( magnitudes (em Db)). (um para cada
-                        subsistema SISO).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>phi</term>
-                <listitem>
-                    <para>vetor linha ou matriz ( fases (em graus)) (um para cada
-                        subsistema SISO ).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>repf</term>
-                <listitem>
-                    <para>vetor linha ou matriz de números complexos (freqüência de
-                        resposta complexa).
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>Diagrama de bode , i.e magnitude e fase da freqüência de resposta de
-            <literal>sl</literal>.
-        </para>
-        <para>
-            <literal>sl</literal> pode ser um sistema SIMO de tempo contínuo ou
-            discreto (ver <literal>syslin</literal>). No caso de múltiplas saídas,
-            elas são esboçadas com símbolos diferentes.
-        </para>
-        <para>
-            As freqüências são dadas pelos limites <literal>fmin,fmax</literal>
-            (em Hz) ou por um vetor linha (ou uma matriz para múltiplas saídas)
-            <literal>frq</literal>.
-        </para>
-        <para>
-            <literal>step</literal> é o passo de discretização ( logarítmica).
-            (ver <literal>calfrq</literal> para escolha do valor padrão).
-        </para>
-        <para>
-            <literal>comments</literal> é um vetor de strings (legendas).
-        </para>
-        <para>
-            <literal>db,phi</literal> são matrizes de módulos (em Db) e fases
-            (em graus). (Uma linha para cada resposta).
-        </para>
-        <para>
-            <literal>repf</literal> matriz de números complexos. Uma linha para
-            cada resposta.
-        </para>
-        <para>
-            Valores padrões para <literal>fmin</literal> e
-            <literal>fmax</literal> são <literal>1.d-3</literal>,
-            <literal>1.d+3</literal> se <literal>sl</literal> for de tempo contínuo ou
-            <literal>1.d-3</literal>, <literal>0.5</literal>/sl.dt (freqüência de
-            Nyquist) se <literal>sl</literal> for de tempo discreto. Discretização
-            automática das freqüências é feita por <literal>calfrq</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-s=poly(0,'s')
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-clf();bode(h,0.01,100);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s=poly(0,'s')
-                h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-                clf();bode(h,0.01,100);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s=poly(0,'s')
-h1=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-num=22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
-den=22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4
-h2=syslin('c',num/den);
-
-clf();bode([h1;h2],0.01,100,['h1';'h2'])
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s=poly(0,'s')
-                h1=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-                num=22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
-                den=22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4
-                h2=syslin('c',num/den);
-
-                clf();bode([h1;h2],0.01,100,['h1';'h2'])
-            </scilab:image>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="black">black</link>
-            </member>
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="gainplot">gainplot</link>
-            </member>
-            <member>
-                <link linkend="repfreq">repfreq</link>
-            </member>
-            <member>
-                <link linkend="g_margin">g_margin</link>
-            </member>
-            <member>
-                <link linkend="p_margin">p_margin</link>
-            </member>
-            <member>
-                <link linkend="calfrq">calfrq</link>
-            </member>
-            <member>
-                <link linkend="phasemag">phasemag</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/cacsd/help/pt_BR/linear_analysis/freq_domain/bode_asymp.xml b/scilab/modules/cacsd/help/pt_BR/linear_analysis/freq_domain/bode_asymp.xml
deleted file mode 100644 (file)
index 048466a..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Scilab Enterprises - Paul Bignier
- * Copyright (C) 09/2013 - A. Khorshidi
- *
- * 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="bode_asymp" xml:lang="pt">
-    <refnamediv>
-        <refname>bode_asymp</refname>
-        <refpurpose>Bode plot asymptote</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            bode_asymp(sl, [wmin, wmax])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>sl</term>
-                <listitem>
-                    <para>
-                        <literal>syslin</literal> list (SISO or SIMO linear system)
-                        in continuous time (type state-space or rational).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>wmin, wmax</term>
-                <listitem>
-                    <para>Real scalars: lower and upper frequency bounds (in rad/s).</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>Plots the asymptote of the system
-            <literal>sl</literal>.
-        </para>
-        <para>
-            The optional arguments <literal>wmin</literal> and <literal>wmax</literal> (in rad/s) can be used to plot asymptote in a specific range of frequency.
-        </para>
-        <para>
-            <note>
-                Note that the function <code>bode()</code> or <code>gainplot()</code> must be called before <code>bode_asymp()</code>.
-            </note>
-        </para>
-        <para>
-            <warning>
-                Warning: this function is not applicable when the first input argument is a real matrix.
-            </warning>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-s = poly(0, "s");
-h = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-
-clf(); bode(h, 0.01, 100); bode_asymp(h);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, "s");
-                h = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                clf(); bode(h, 0.01, 100); bode_asymp(h);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = poly(0, "s");
-h1 = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-h2 = syslin("c", (10*(s+3))/(s*(s+2)*(s^2+s+2)));
-
-clf(); bode([h1; h2], 0.01, 100, ["h1"; "h2"]); bode_asymp([h1; h2]);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, "s");
-                h1 = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                h2 = syslin("c", (10*(s+3))/(s*(s+2)*(s^2+s+2)));
-                clf(); bode([h1; h2], 0.01, 100, ["h1"; "h2"]); bode_asymp([h1; h2]);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = %s;
-G = (s+10)/(s*(s+100)); // A rational matrix
-sys = syslin("c", G); // A continuous-time linear system in transfer matrix representation.
-f_min = .0001; f_max = 1600; // Frequencies in Hz
-
-clf(); bode(sys, f_min, f_max, "rad"); // The optional argument "rad" converts Hz to rad/s
-bode_asymp(sys, 10, 1000); // Plots asymptotes in the given range of frequency (in rad/s).
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = %s;
-                G = (s+10)/(s*(s+100));
-                sys = syslin("c", G);
-                f_min = .0001; f_max = 1600;
-                clf(); bode(sys, f_min, f_max, "rad");
-                bode_asymp(sys, 10, 1000);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = poly(0, "s");
-h = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-h = tf2ss(h);
-
-clf();
-gainplot(h, 0.01, 100, "$\frac{s^2+18 s+100}{s^2+6.06 s+102.1}$"); // Frequencies in Hertz
-bode_asymp(h)
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0,"s");
-                h = syslin("c",(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                h = tf2ss(h);
-                clf();
-                gainplot(h, 0.01, 100, "$\frac{s^2+18 s+100}{s^2+6.06 s+102.1}$");
-                bode_asymp(h)
-            </scilab:image>
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="bode">bode</link>
-            </member>
-            <member>
-                <link linkend="black">black</link>
-            </member>
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="gainplot">gainplot</link>
-            </member>
-            <member>
-                <link linkend="repfreq">repfreq</link>
-            </member>
-            <member>
-                <link linkend="g_margin">g_margin</link>
-            </member>
-            <member>
-                <link linkend="p_margin">p_margin</link>
-            </member>
-            <member>
-                <link linkend="calfrq">calfrq</link>
-            </member>
-            <member>
-                <link linkend="phasemag">phasemag</link>
-            </member>
-            <member>
-                <link linkend="datatips">datatips</link>
-            </member>
-            <member>
-                <link linkend="show_margins">show_margins</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revremark>bode_asymp() function introduced.</revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/cacsd/help/ru_RU/linear_analysis/freq_domain/bode.xml b/scilab/modules/cacsd/help/ru_RU/linear_analysis/freq_domain/bode.xml
deleted file mode 100644 (file)
index 78b29b8..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="bode" xml:lang="ru">
-    <refnamediv>
-        <refname>bode</refname>
-        <refpurpose>Bode plot</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            bode(sl, [fmin, fmax] [,step] [,comments] )
-            bode(sl, [fmin, fmax] [,step] [,comments] [,"rad"] )
-            bode(sl, frq [,comments] )
-            bode(sl, frq [,comments] [,"rad"] )
-            bode(frq, db, phi [,comments] )
-            bode(frq, repf [,comments] [,"rad"] )
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>sl</term>
-                <listitem>
-                    <para>
-                        <literal>syslin</literal> list (SISO or SIMO linear system)
-                        in continuous or discrete time.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>fmin,fmax</term>
-                <listitem>
-                    <para>real (frequency bounds (in Hz))</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>step</term>
-                <listitem>
-                    <para>real (logarithmic step.)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>comments</term>
-                <listitem>
-                    <para>vector of character strings (captions).</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>frq</term>
-                <listitem>
-                    <para>row vector or matrix (frequencies (in Hz) ) (one row for each
-                        SISO subsystem).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>db</term>
-                <listitem>
-                    <para>row vector or matrix ( magnitudes (in Db)). (one row for each
-                        SISO subsystem).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>phi</term>
-                <listitem>
-                    <para>row vector or matrix ( phases (in degree)) (one row for each
-                        SISO subsystem).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>repf</term>
-                <listitem>
-                    <para>row vector or matrix of complex numbers (complex frequency
-                        response).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>"rad"</term>
-                <listitem>
-                    <para>converts the frequency from Hz into rad/s (multiplies by 2&#960;),
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>Bode plot, i.e magnitude and phase of the frequency response of
-            <literal>sl</literal>.
-        </para>
-        <para>
-            <literal>sl</literal> can be a continuous-time or discrete-time SIMO
-            system (see <literal>syslin</literal>). In case of multi-output the
-            outputs are plotted with different symbols.
-        </para>
-        <para>
-            The frequencies are given by the bounds <literal>fmin,fmax</literal>
-            (in Hz) or by a row-vector (or a matrix for multi-output)
-            <literal>frq</literal>.
-        </para>
-        <para>
-            <literal>step</literal> is the ( logarithmic ) discretization step.
-            (see <literal>calfrq</literal> for the choice of default value).
-        </para>
-        <para>
-            <literal>comments</literal> is a vector of character strings
-            (captions).
-        </para>
-        <para>
-            <literal>db,phi</literal> are the matrices of modulus (in Db) and
-            phases (in degrees). (One row for each response).
-        </para>
-        <para>
-            <literal>repf</literal> matrix of complex numbers. One row for each
-            response.
-        </para>
-        <para>
-            Default values for <literal>fmin</literal> and
-            <literal>fmax</literal> are <literal>1.d-3</literal>,
-            <literal>1.d+3</literal> if <literal>sl</literal> is continuous-time or
-            <literal>1.d-3</literal>, <literal>0.5</literal>/sl.dt (nyquist frequency)
-            if <literal>sl</literal> is discrete-time. Automatic discretization of
-            frequencies is made by <literal>calfrq</literal>.
-        </para>
-        <para>
-            The
-            <link linkend="datatips">datatips</link>
-            tool may be used
-            to display data along the phase and modulus curves.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-s = poly(0, 's');
-h = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-
-clf(); bode(h, 0.01, 100);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, 's');
-                h = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                clf(); bode(h, 0.01, 100);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = poly(0, 's');
-h1 = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-num = 22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
-den = 22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4;
-h2 = syslin('c', num/den);
-
-clf(); bode([h1; h2], 0.01, 100, ['h1'; 'h2']);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, 's');
-                h1 = syslin('c', (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                num = 22801+4406.18*s+382.37*s^2+21.02*s^3+s^4;
-                den = 22952.25+4117.77*s+490.63*s^2+33.06*s^3+s^4;
-                h2 = syslin('c', num/den);
-                clf(); bode([h1; h2], 0.01, 100, ['h1'; 'h2']);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = %s;
-G = (10*(s+3))/(s*(s+2)*(s^2+s+2)); // A rational matrix
-sys = syslin('c', G); // A continuous-time linear system in transfer matrix representation.
-f_min = .0001; f_max = 16; // Frequencies in Hz
-
-clf(); bode(sys, f_min, f_max, "rad"); // Converts Hz to rad/s
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = %s;
-                G = (10*(s+3))/(s*(s+2)*(s^2+s+2)); // A rational matrix
-                sys = syslin('c', G); // A continuous-time linear system in transfer matrix representation.
-                f_min = .0001; f_max = 16; // Frequencies in Hz
-                clf(); bode(sys, f_min, f_max, "rad"); // Converts Hz to rad/s
-            </scilab:image>
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="bode_asymp">bode_asymp</link>
-            </member>
-            <member>
-                <link linkend="black">black</link>
-            </member>
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="gainplot">gainplot</link>
-            </member>
-            <member>
-                <link linkend="repfreq">repfreq</link>
-            </member>
-            <member>
-                <link linkend="g_margin">g_margin</link>
-            </member>
-            <member>
-                <link linkend="p_margin">p_margin</link>
-            </member>
-            <member>
-                <link linkend="calfrq">calfrq</link>
-            </member>
-            <member>
-                <link linkend="phasemag">phasemag</link>
-            </member>
-            <member>
-                <link linkend="datatips">datatips</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/cacsd/help/ru_RU/linear_analysis/freq_domain/bode_asymp.xml b/scilab/modules/cacsd/help/ru_RU/linear_analysis/freq_domain/bode_asymp.xml
deleted file mode 100644 (file)
index 4b2b3b4..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Scilab Enterprises - Paul Bignier
- * Copyright (C) 09/2013 - A. Khorshidi
- *
- * 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="bode_asymp" xml:lang="ru">
-    <refnamediv>
-        <refname>bode_asymp</refname>
-        <refpurpose>Bode plot asymptote</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            bode_asymp(sl, [wmin, wmax])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>sl</term>
-                <listitem>
-                    <para>
-                        <literal>syslin</literal> list (SISO or SIMO linear system)
-                        in continuous time (type state-space or rational).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>wmin, wmax</term>
-                <listitem>
-                    <para>Real scalars: lower and upper frequency bounds (in rad/s).</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>Plots the asymptote of the system
-            <literal>sl</literal>.
-        </para>
-        <para>
-            The optional arguments <literal>wmin</literal> and <literal>wmax</literal> (in rad/s) can be used to plot asymptote in a specific range of frequency.
-        </para>
-        <para>
-            <note>
-                Note that the function <code>bode()</code> or <code>gainplot()</code> must be called before <code>bode_asymp()</code>.
-            </note>
-        </para>
-        <para>
-            <warning>
-                Warning: this function is not applicable when the first input argument is a real matrix.
-            </warning>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-s = poly(0, "s");
-h = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-
-clf(); bode(h, 0.01, 100); bode_asymp(h);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, "s");
-                h = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                clf(); bode(h, 0.01, 100); bode_asymp(h);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = poly(0, "s");
-h1 = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-h2 = syslin("c", (10*(s+3))/(s*(s+2)*(s^2+s+2)));
-
-clf(); bode([h1; h2], 0.01, 100, ["h1"; "h2"]); bode_asymp([h1; h2]);
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0, "s");
-                h1 = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                h2 = syslin("c", (10*(s+3))/(s*(s+2)*(s^2+s+2)));
-                clf(); bode([h1; h2], 0.01, 100, ["h1"; "h2"]); bode_asymp([h1; h2]);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = %s;
-G = (s+10)/(s*(s+100)); // A rational matrix
-sys = syslin("c", G); // A continuous-time linear system in transfer matrix representation.
-f_min = .0001; f_max = 1600; // Frequencies in Hz
-
-clf(); bode(sys, f_min, f_max, "rad"); // The optional argument "rad" converts Hz to rad/s
-bode_asymp(sys, 10, 1000); // Plots asymptotes in the given range of frequency (in rad/s).
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = %s;
-                G = (s+10)/(s*(s+100));
-                sys = syslin("c", G);
-                f_min = .0001; f_max = 1600;
-                clf(); bode(sys, f_min, f_max, "rad");
-                bode_asymp(sys, 10, 1000);
-            </scilab:image>
-        </para>
-        <programlisting role="example"><![CDATA[
-s = poly(0, "s");
-h = syslin("c", (s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-h = tf2ss(h);
-
-clf();
-gainplot(h, 0.01, 100, "$\frac{s^2+18 s+100}{s^2+6.06 s+102.1}$"); // Frequencies in Hertz
-bode_asymp(h)
- ]]></programlisting>
-        <para>
-            <scilab:image localized="true">
-                s = poly(0,"s");
-                h = syslin("c",(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
-                h = tf2ss(h);
-                clf();
-                gainplot(h, 0.01, 100, "$\frac{s^2+18 s+100}{s^2+6.06 s+102.1}$");
-                bode_asymp(h)
-            </scilab:image>
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="bode">bode</link>
-            </member>
-            <member>
-                <link linkend="black">black</link>
-            </member>
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="gainplot">gainplot</link>
-            </member>
-            <member>
-                <link linkend="repfreq">repfreq</link>
-            </member>
-            <member>
-                <link linkend="g_margin">g_margin</link>
-            </member>
-            <member>
-                <link linkend="p_margin">p_margin</link>
-            </member>
-            <member>
-                <link linkend="calfrq">calfrq</link>
-            </member>
-            <member>
-                <link linkend="phasemag">phasemag</link>
-            </member>
-            <member>
-                <link linkend="datatips">datatips</link>
-            </member>
-            <member>
-                <link linkend="show_margins">show_margins</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revremark>bode_asymp() function introduced.</revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index 20d9826..bd2929b 100644 (file)
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="colon">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="colon">
     <refnamediv>
-        <refname>colon</refname>
-        <refpurpose>(:) colon operator</refpurpose>
+        <refname>colon (:)</refname>
+        <refpurpose>Ranging operator. Addresses all elements along an array dimension or of a list.</refpurpose>
     </refnamediv>
     <refsection>
         <title>Description</title>
@@ -30,8 +47,9 @@
             </varlistentry>
         </variablelist>
         <para>
-            The colon notation can also be used to pick out selected rows,
-            columns and elements of vectors and matrices (see also <link linkend="extraction">extraction</link>,<link linkend="insertion">insertion</link>):
+            The colon notation can also be used to pick out selected rows,  columns and elements
+            of vectors and other arrays (see also <link linkend="extraction">extraction</link>,
+            <link linkend="insertion">insertion</link>):
         </para>
         <variablelist>
             <varlistentry>
                 <term>A(:)=w</term>
                 <listitem>
                     <para>
-                        fills the matrix <literal>A</literal> with entries of <literal>w</literal>
-                        (taken column by column if <literal>w</literal> is a matrix). The amount of
+                        fills the array <literal>A</literal> with entries of <literal>w</literal>
+                        (taken column by column if <literal>w</literal> is a 2D array). The amount of
                         entries of <literal>A</literal> must be equal to the amount of
                         entries of <literal>w</literal>.
                     </para>
             <literal>k</literal> or <literal>d</literal> have a decimal part, only
             the integer part will be used.
         </para>
+       <note>
+          <literal>type(:)</literal> is 129.
+          <literal>typeof(:)</literal> is <literal>"implicitlist"</literal>.
+       </note>
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -147,10 +169,13 @@ A(i)
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="matrix">matrix</link>
+                <link linkend="dollar">dollar</link>
             </member>
             <member>
-                <link linkend="for">for</link>
+                <link linkend="extraction">extraction</link>
+            </member>
+            <member>
+                <link linkend="matrix">matrix</link>
             </member>
             <member>
                 <link linkend="linspace">linspace</link>
@@ -160,4 +185,15 @@ A(i)
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                  <literal>%i:10</literal> now yields an error.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index f1d8e78..39ae2f4 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="comments">
+<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="comments">
     <refnamediv>
         <refname>comments</refname>
         <refpurpose>(// or /*...*/) comments</refpurpose>
@@ -46,6 +49,9 @@ help myfunction
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="head_comments">head_comments</link>
+            </member>
+            <member>
                 <link linkend="slash">slash</link>
             </member>
             <member>
@@ -53,4 +59,15 @@ help myfunction
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <literal>/* .. */</literal> block comments introduced.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 45656f1..f237678 100644 (file)
@@ -51,7 +51,9 @@
             </para>
             <para>
                 <warning>
-                    Exponentiation is right-associative in Scilab contrarily to Matlab&#174; and Octave. For example 2^3^4 is equal to 2^(3^4) in Scilab but is equal to (2^3)^4 in Matlab&#174; and Octave.
+                    Exponentiation is right-associative in Scilab contrarily to Matlab® and Octave.
+                   For example 2^3^4 is equal to 2^(3^4) in Scilab but is equal to (2^3)^4 in Matlab®
+                   and Octave.
                 </warning>
             </para>
         </refsection>
index bcb8d78..59ea522 100644 (file)
@@ -69,8 +69,6 @@ evstr(a(i+2))*2
 --> "This session has been launched from " + a(i+3)
  ans  =
  This session has been launched from "C:\Users\Me"
-
--->
 ]]></screen>
                      </para>
                      <para>
@@ -529,7 +527,12 @@ echo $? ]]></screen>
             <revision>
                 <revnumber>6.0.1</revnumber>
                 <revremark>
-                    <literal>-scihome</literal> option added.
+                  <para><literal>-scihome</literal> option added.</para>
+                  <para>On Windows, a new <literal>scilab.bat</literal> file becomes the main
+                    executable script managing all launching options. There are now 3 binaries
+                    Wscilex.exe, Wscilex-cli.exe, and Scilex.exe corresponding to each Scilab
+                    running mode (STD, NW, NWNI).
+                  </para>
                 </revremark>
             </revision>
         </revhistory>
index 541c6b2..cbfc4ad 100644 (file)
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="colon">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="fr" xml:id="colon">
     <refnamediv>
-        <refname>colon</refname>
-        <refpurpose>(:) opérateur "deux points"  </refpurpose>
+        <refname>colon (:)</refname>
+        <refpurpose>Générateur de séries. Adresse tous les éléments d'une liste ou d'un tableau</refpurpose>
     </refnamediv>
     <refsection>
         <title>Description</title>
@@ -30,7 +47,7 @@
             </varlistentry>
         </variablelist>
         <para>Cet opérateur peut aussi être utilisé pour sélectionner des lignes
-            ou des colonnes d'une matrice, ou bien des sous-matrices (voir aussi
+            ou des colonnes d'un tableau, ou bien des sous-tableaux (voir aussi
             <link linkend="extraction">extraction</link>,  <link linkend="insertion">insertion</link>) :
         </para>
         <variablelist>
@@ -38,8 +55,8 @@
                 <term>A(:)</term>
                 <listitem>
                     <para>
-                        est le vecteur de tous les éléments de la matrice <literal>A</literal>,
-                        considérée comme un vecteur colonne (les colonnes sont mises bout à
+                        est le vecteur de tous les éléments du tableau <literal>A</literal>,
+                        considéré comme un vecteur colonne (les colonnes sont mises bout à
                         bout);
                     </para>
                 </listitem>
                 <term>A(:)=w</term>
                 <listitem>
                     <para>
-                        remplit la matrice <literal>A</literal> avec les composantes de
-                        <literal>w</literal> (prises colonne par colonne si <literal>w</literal> est une
-                        matrice). Le nombre de valeurs de <literal>A</literal> doit être égal au nombre de valeurs de <literal>w</literal>.
+                        remplit le tableau <literal>A</literal> avec les composantes de
+                        <literal>w</literal> (prises colonne par colonne si <literal>w</literal> est
+                        un tableau 2D). <literal>A</literal> et <literal>w</literal> doivent avoir
+                        le même nombre d'éléments.
                     </para>
                 </listitem>
             </varlistentry>
             Merci de noter que même si <literal>i</literal>, <literal>j</literal>,
             <literal>k</literal> ou <literal>d</literal> ont une partie décimale, seule la partie entière sera utilisée.
         </para>
+       <note>
+          <literal>type(:)</literal> est 129.
+          <literal>typeof(:)</literal> est <literal>"implicitlist"</literal>.
+       </note>
     </refsection>
     <refsection>
         <title>Exemples</title>
@@ -140,17 +162,19 @@ A(:) = w
 // Si les indices ne sont pas des valeurs entières
 i = 1:0.4:10; // Indices
 A(i)
-
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="matrix">matrix</link>
+                <link linkend="dollar">dollar</link>
+            </member>
+            <member>
+                <link linkend="extraction">extraction</link>
             </member>
             <member>
-                <link linkend="for">for</link>
+                <link linkend="matrix">matrix</link>
             </member>
             <member>
                 <link linkend="linspace">linspace</link>
@@ -160,4 +184,15 @@ A(i)
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                  <literal>%i:10</literal> produit désormais une erreur.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 0f509d8..2eafbce 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="comments">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="fr" xml:id="comments">
     <refnamediv>
         <refname>comments</refname>
         <refpurpose>(// ou /*...*/) commentaires</refpurpose>
@@ -42,9 +45,12 @@ help myfunction
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>See also</title>
+        <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
+                <link linkend="head_comments">head_comments</link>
+            </member>
+            <member>
                 <link linkend="slash">slash</link>
             </member>
             <member>
@@ -52,4 +58,15 @@ help myfunction
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    Introduction des blocs de commentaires <literal>/* .. */</literal>.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index e9e426a..d4e2a75 100644 (file)
@@ -34,7 +34,9 @@
             </para>
             <para>
                 <warning>
-                    L'élévation à la puissance est associative à droite dans Scilab contrairement à Matlab&#174; et Octave. Par exemple 2^3^4 est égal à 2^(3^4) dans Scilab mais est égal à (2^3)^4 dans Matlab&#174; et Octave.
+                    L'élévation à la puissance est associative à droite dans Scilab contrairement à
+                    Matlab® et Octave. Par exemple 2^3^4 est égal à 2^(3^4) dans Scilab mais est
+                    égal à (2^3)^4 dans Matlab® et Octave.
                 </warning>
             </para>
         </refsection>
index 16f516d..43d653a 100644 (file)
@@ -23,18 +23,27 @@ scilab &lt;Options&gt;
                     <para>
                         Cette option permet de transmettre des données à la session Scilab à ouvrir :
                         <itemizedlist>
-                            <listitem>Des données consécutives sont séparées par un ou plusieurs espaces.
+                            <listitem>
+                              Des données consécutives sont séparées par un ou plusieurs espaces.
                             </listitem>
-                            <listitem>Une expression entre guillemets <literal>"</literal> constitue une donnée unique.
+                            <listitem>
+                              Une expression entre guillemets <literal>"</literal> constitue une
+                              donnée unique.
                             </listitem>
-                            <listitem>Pour inclure un guillemet dans une donnée, écrire <literal>\"</literal> au lieu de <literal>"</literal>.
+                            <listitem>
+                              Pour inclure un guillemet dans une donnée, écrire <literal>\"</literal>
+                              au lieu de <literal>"</literal>.
                             </listitem>
-                            <listitem>L'apostrophe <literal>'</literal> est un caractère normal. Il n'a pas de signification particulière.
+                            <listitem>
+                              L'apostrophe <literal>'</literal> est un caractère normal. Il n'a pas
+                              de signification particulière.
                             </listitem>
                         </itemizedlist>
                     </para>
                     <para>
-                      Dans la session ouverte, les données <literal>arg#1, arg#2, ..</literal> peuvent être récupérées comme autant d'expressions texte avec <link linkend="sciargs">sciargs()</link>.
+                      Dans la session ouverte, les données <literal>arg#1, arg#2, ..</literal>
+                      peuvent être récupérées comme autant d'expressions texte avec
+                      <link linkend="sciargs">sciargs()</link>.
                      </para>
                      <para>
                       Exemple :
@@ -69,12 +78,13 @@ evstr(a(i+2))*2
 --> "Cette session a été lancée depuis " + a(i+3)
  ans  =
  Cette session a été lancée depuis "C:\Users\Me"
-
--->
 ]]></screen>
                      </para>
                      <para>
-                     <note>Utiliser <literal>-args</literal> comme <emphasis role="italic">dernière</emphasis> option sur la ligne de commande est plus sûr.
+                     <note>
+                       Utiliser <literal>-args</literal> comme
+                       <emphasis role="italic">dernière</emphasis> option sur la ligne de commande
+                       est plus sûr.
                      </note>
                      </para>
                 </listitem>
@@ -99,18 +109,24 @@ evstr(a(i+2))*2
                         À l'issue du démarrage complet de la session, cette option
                         <itemizedlist>
                             <listitem>
-                                <para>fixe le dossier de travail de Scilab au dossier système depuis lequel Scilab a été lancé. Voir l'exemple donné plus bas pour l'option <literal>-f</literal>. Puis,
+                                <para>
+                                    fixe le dossier de travail de Scilab au dossier système depuis
+                                    lequel Scilab a été lancé. Voir l'exemple donné plus bas pour
+                                    l'option <literal>-f</literal>. Puis,
                                 </para>
                             </listitem>
                             <listitem>
-                                <para>éxécute les <literal>Instructions</literal> Scilab indiquées. Exemple :
+                                <para>
+                                  éxécute les <literal>Instructions</literal> Scilab indiquées.
+                                  Exemple :
                                     <screen><![CDATA[ scilab-cli -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb ]]></screen>
                                 </para>
                             </listitem>
                         </itemizedlist>
                     </para>
                     <warning>
-                        Les options <literal>-e</literal> et <literal>-f</literal> ne peuvent pas être utilisées ensemble.
+                        Les options <literal>-e</literal> et <literal>-f</literal> ne peuvent pas
+                        être utilisées ensemble.
                     </warning>
                 </listitem>
             </varlistentry>
@@ -118,18 +134,26 @@ evstr(a(i+2))*2
                 <term>-f Fichier</term>
                 <listitem>
                     <para>
-                        Si cette option est indiquée, alors au début de la session Scilab, après l'exécution des fichiers de démarrage de Scilab et de l'utilisateur, et après l'activation des Préférences de l'utilisateur -- dont celles concernant le dossier de travail par défaut --,
+                        Si cette option est indiquée, alors au début de la session Scilab, après
+                        l'exécution des fichiers de démarrage de Scilab et de l'utilisateur, et
+                        après l'activation des Préférences de l'utilisateur -- dont celles
+                        concernant le dossier de travail par défaut --,
                         <itemizedlist>
                             <listitem>
                                 <para>
-                                    le dossier de travail de Scilab est fixé au dossier système depuis lequel Scilab a été lancé. Par exemple,
+                                    le dossier de travail de Scilab est fixé au dossier système
+                                    depuis lequel Scilab a été lancé. Par exemple,
                                     <screen><![CDATA[D:\users\me\scilab\dev> C:\scilab-5.5.2\bin\scilex -f ..\test.sce]]></screen>
                                     exécutera <literal>cd("D:\users\me\scilab\dev")</literal>.
                                 </para>
                             </listitem>
                             <listitem>
                                 <para>
-                                    le script Scilab <literal>Fichier</literal> est exécuté. S'il est indiqué avec un chemin relatif (<literal>.\</literal> par défaut, ou tel que <literal>..\</literal> dans l'exemple ci-dessus), celui-ci se réfère au nouveau dossier de travail de Scilab.
+                                    le script Scilab <literal>Fichier</literal> est exécuté. S'il
+                                    est indiqué avec un chemin relatif (<literal>.\</literal> par
+                                    défaut, ou tel que <literal>..\</literal> dans l'exemple
+                                    ci-dessus), celui-ci se réfère au nouveau dossier de travail de
+                                    Scilab.
                                 </para>
                             </listitem>
                         </itemizedlist>
@@ -163,8 +187,8 @@ evstr(a(i+2))*2
                     <para>
                         Les valeurs possible pour sont <literal>-l fr</literal> pour
                         sélectionner le francais et <literal>-l en</literal> pour
-                        sélectionner l'anglais. La langue par défaut est établie à l'anglais dans le fichier
-                        <literal>scilab.start</literal>.
+                        sélectionner l'anglais. La langue par défaut est établie à l'anglais dans
+                        le fichier <literal>scilab.start</literal>.
                     </para>
                     <para>Avec certains systèmes, la compilation des locales peut être
                         nécessaire pour rendre correctement les polices UTF-8.
@@ -230,7 +254,7 @@ evstr(a(i+2))*2
                         <itemizedlist>
                             <listitem>
                                 <para>Les fonctionnalités de pipe sont accessibles pour tous les
-                                    systèmes d'exploitations (voir les examples pour plus de
+                                    systèmes d'exploitation (voir les examples pour plus de
                                     détails)
                                 </para>
                             </listitem>
@@ -270,13 +294,13 @@ evstr(a(i+2))*2
                         <itemizedlist>
                             <listitem>
                                 <para>Les fonctionnalités de pipe sont accessibles pour tous les
-                                    systèmes d'exploitations (voir les exemples pour plus de
+                                    systèmes d'exploitation (voir les exemples pour plus de
                                     détails)
                                 </para>
                             </listitem>
                             <listitem>
                                 <para>La distribution de Scilab fournit aussi un binaire dédié
-                                    faisant la même chose que l'option <emphasis>-nw</emphasis>:
+                                    faisant la même chose que l'option <emphasis>-nwni</emphasis>:
                                     <itemizedlist>
                                         <listitem>
                                             Windows: <literal>Scilex.exe</literal>.
@@ -372,14 +396,20 @@ evstr(a(i+2))*2
             <varlistentry>
                 <term>SCIVERBOSE</term>
                 <listitem>
-                    <para>Si cette variable d'environnement est présente, le script de démarrage de Scilab affichera les informations de debug. Principalement utilisée pour du debug ou le report de bugs.</para>
+                    <para>
+                      Si cette variable d'environnement est présente, le script de démarrage de
+                      Scilab affichera les informations de debug. Principalement utilisée pour du
+                      debug ou le report de bugs.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>JAVA_HOME</term>
                 <listitem>
                     <para>
-                        Indique quelle version de Java utiliser. Par exemple, <literal>JAVA_HOME=/usr/lib/jvm/java-7-openjdk/ scilab</literal> démarrera Scilab avec la version 7 de Java.
+                        Indique quelle version de Java utiliser. Par exemple,
+                        <literal>JAVA_HOME=/usr/lib/jvm/java-7-openjdk/ scilab</literal> démarrera
+                        Scilab avec la version 7 de Java.
                     </para>
                 </listitem>
             </varlistentry>
@@ -401,7 +431,8 @@ evstr(a(i+2))*2
     <refsection role="description">
         <title>Options JVM (Java Virtual Machine)</title>
         <para>
-            Les options décrites ci-dessous sont inutiles et sans effet lorsque l'option <literal>-nwni</literal> est utilisée.
+            Les options décrites ci-dessous sont inutiles et sans effet lorsque l'option
+            <literal>-nwni</literal> est utilisée.
         </para>
         <para>A partir de la version 5.0 de Scilab, l'interface graphique et le
             système de génération de la documentation sont basés sur des
@@ -460,7 +491,9 @@ evstr(a(i+2))*2
             </varlistentry>
         </variablelist>
         <para>
-            De nombreuses options sont disponibles. Elles peuvent améliorer les performances, changer le rendu graphique, la gestion de la mémoire... Voir: <ulink url="http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html">http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html</ulink>
+            De nombreuses options sont disponibles. Elles peuvent améliorer les performances,
+            changer le rendu graphique, la gestion de la mémoire...
+            Voir: <ulink url="http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html">http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html</ulink>
         </para>
     </refsection>
     <refsection role="examples">
@@ -542,6 +575,11 @@ echo $? ]]></screen>
                 <revnumber>6.0.1</revnumber>
                 <revremark>
                     Option <literal>-scihome</literal> ajoutée.
+                  <para>Sur Windows, un nouveau fichier <literal>scilab.bat</literal> devient
+                    le principal script executable gérant toutes les options de lancement. Il y a
+                    désormais 3 binaires exécutables Wscilex.exe, Wscilex-cli.exe, et Scilex.exe
+                    correspondant à chacun des modes STD|NW|NWNI de lancement de Scilab.
+                  </para>
                 </revremark>
             </revision>
         </revhistory>
index b624f2c..14e1a62 100644 (file)
@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="colon">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ja" xml:id="colon">
 
     <refnamediv>
 
-        <refname>colon</refname>
+        <refname>colon (:)</refname>
 
-        <refpurpose>(:) コロン演算子</refpurpose>
+        <refpurpose>コロン演算子</refpurpose>
 
     </refnamediv>
 
             ある場合でも,整数部のみが使用されることに注意してください.
 
         </para>
-
+       <note>
+          <literal>type(:)</literal> is 129.
+          <literal>typeof(:)</literal> is <literal>"implicitlist"</literal>.
+       </note>
     </refsection>
 
     <refsection>
@@ -263,38 +282,35 @@ A(i)
     </refsection>
 
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
-                <link linkend="matrix">matrix</link>
-
+                <link linkend="dollar">dollar</link>
             </member>
-
             <member>
-
-                <link linkend="for">for</link>
-
+                <link linkend="extraction">extraction</link>
+            </member>
+            <member>
+                <link linkend="matrix">matrix</link>
             </member>
-
             <member>
-
                 <link linkend="linspace">linspace</link>
-
             </member>
-
             <member>
-
                 <link linkend="logspace">logspace</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                  <literal>%i:10</literal> now yields an error.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
 
index 118ac34..ec8f1ab 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="comments">
+<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="comments">
     <refnamediv>
         <refname>comments</refname>
         <refpurpose>(// or /*...*/) comments</refpurpose>
@@ -40,4 +43,29 @@ endfunction
 help myfunction
  ]]></programlisting>
     </refsection>
+    <refsection role="see also">
+        <title>参照</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="head_comments">head_comments</link>
+            </member>
+            <member>
+                <link linkend="slash">slash</link>
+            </member>
+            <member>
+                <link linkend="backslash">backslash</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <literal>/* .. */</literal> block comments introduced.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 04c6be9..30aba6a 100644 (file)
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="colon" xml:lang="pt">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="colon" xml:lang="pt">
     <refnamediv>
-        <refname>colon</refname>
-        <refpurpose>(:) operador dois pontos</refpurpose>
+        <refname>colon (:)</refname>
+        <refpurpose>operador dois pontos</refpurpose>
     </refnamediv>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
             Colon symbol <literal>:</literal> can be used to form implicit
             vectors. (see also <link linkend="linspace">linspace</link>, <link linkend="logspace">logspace</link>)
@@ -15,7 +32,7 @@
                 <term>j:k</term>
                 <listitem>
                     <para>
-                        é o vetor <literal>[j, j+1,...,k]</literal> (vazio se
+                        é o vetor <literal>[j, j+1,...,k]</literal> (vazio se
                         <literal>j&gt;k</literal>).
                     </para>
                 </listitem>
                 <term>j:d:k</term>
                 <listitem>
                     <para>
-                        é o vetor <literal>[j, j+d, ..., j+m*d] </literal>
+                        é o vetor <literal>[j, j+d, ..., j+m*d] </literal>
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
-        <para>A notação de dois pontos também pode ser usada para retirar linhas,
-            colunas e elementos selecionados de vetores e matrizes (ver também <link linkend="extraction">extraction</link>,<link linkend="insertion">insertion</link>)
+        <para>A notação de dois pontos também pode ser usada para retirar linhas,
+            colunas e elementos selecionados de vetores e matrizes (ver também
+            <link linkend="extraction">extraction</link>,<link linkend="insertion">insertion</link>)
         </para>
         <variablelist>
             <varlistentry>
                 <term>A(:)</term>
                 <listitem>
                     <para>
-                        é o vetor de todos os elementos de <literal>A</literal>
-                        considerados como uma única coluna.
+                        é o vetor de todos os elementos de <literal>A</literal>
+                        considerados como uma única coluna.
                     </para>
                 </listitem>
             </varlistentry>
@@ -46,7 +64,7 @@
                 <term>A(:,j)</term>
                 <listitem>
                     <para>
-                        é a j-ésima coluna de <literal>A</literal>
+                        é a j-ésima coluna de <literal>A</literal>
                     </para>
                 </listitem>
             </varlistentry>
@@ -54,7 +72,7 @@
                 <term>A(j:k)</term>
                 <listitem>
                     <para>
-                        é <literal>[A(j),A(j+1),...,A(k)]</literal>
+                        é <literal>[A(j),A(j+1),...,A(k)]</literal>
                     </para>
                 </listitem>
             </varlistentry>
@@ -62,7 +80,7 @@
                 <term>A(:,j:k)</term>
                 <listitem>
                     <para>
-                        é <literal>[A(:,j),A(:,j+1),...,A(:,k)] </literal>
+                        é <literal>[A(:,j),A(:,j+1),...,A(:,k)] </literal>
                     </para>
                 </listitem>
             </varlistentry>
                     <para>
                         preenche a matriz <literal>A</literal> com entradas de
                         <literal>w</literal> (tomados coluna a coluna se
-                        <literal>w</literal> é uma matriz).
+                        <literal>w</literal> é uma matriz).
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
+       <note>
+          <literal>type(:)</literal> is 129.
+          <literal>typeof(:)</literal> is <literal>"implicitlist"</literal>.
+       </note>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="matrix">matrix</link>
+                <link linkend="dollar">dollar</link>
             </member>
             <member>
-                <link linkend="for">for</link>
+                <link linkend="extraction">extraction</link>
+            </member>
+            <member>
+                <link linkend="matrix">matrix</link>
             </member>
             <member>
                 <link linkend="linspace">linspace</link>
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                  <literal>%i:10</literal> now yields an error.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 1f926c1..6ea17fd 100644 (file)
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="comments" xml:lang="pt">
+<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="comments" xml:lang="pt">
     <refnamediv>
         <refname>comments</refname>
         <refpurpose>(// or /*...*/) comments</refpurpose>
     </refnamediv>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            Uma seqüência de duas barras <literal> // </literal> fora de uma
-            definição de string marca o início de um comentário. As barras, tanto
-            quanto o restante dos caracteres até o fim das linhas não são
+            Uma seqüência de duas barras <literal> // </literal> fora de uma
+            definição de string marca o início de um comentário. As barras, tanto
+            quanto o restante dos caracteres até o fim das linhas não são
             interpretados.
         </para>
         <para>
@@ -17,9 +20,9 @@
             and */ at the end. It is more useful than // which must be positioned at the
             beginning of each line to comment.
         </para>
-        <para>Dentro de uma função, as primeiras linhas de comentário até a
-            primeira instrução ou linha vazia podem ser usadas para fornecer o
-            conteúdo padrão para a documentação de ajuda da função ("help" da função).
+        <para>Dentro de uma função, as primeiras linhas de comentário até a
+            primeira instrução ou linha vazia podem ser usadas para fornecer o
+            conteúdo padrão para a documentação de ajuda da função ("help" da função).
         </para>
     </refsection>
     <refsection>
@@ -42,4 +45,29 @@ endfunction
 help myfunction
  ]]></programlisting>
     </refsection>
+    <refsection role="see also">
+        <title>Ver Também</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="head_comments">head_comments</link>
+            </member>
+            <member>
+                <link linkend="slash">slash</link>
+            </member>
+            <member>
+                <link linkend="backslash">backslash</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <literal>/* .. */</literal> block comments introduced.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 58c29d4..d85bfac 100644 (file)
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="colon">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ru" xml:id="colon">
     <refnamediv>
-        <refname>colon</refname>
-        <refpurpose>(:) оператор "двоеточие"</refpurpose>
+        <refname>двоеточие (:)</refname>
+        <refpurpose>оператор "двоеточие"</refpurpose>
     </refnamediv>
     <refsection>
         <title>Описание</title>
             Обратите внимание, что если <literal>i</literal>, <literal>j</literal>, <literal>k</literal>
             или <literal>d</literal> являются нецелыми числами, то будет использоваться только целая часть.
         </para>
+       <note>
+          <literal>type(:)</literal> равно 129.
+          <literal>typeof(:)</literal> равно <literal>"implicitlist"</literal>.
+       </note>
     </refsection>
     <refsection>
         <title>Примеры</title>
@@ -149,10 +170,13 @@ A(i)
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="matrix">matrix</link>
+                <link linkend="dollar">доллар</link>
             </member>
             <member>
-                <link linkend="for">for</link>
+                <link linkend="extraction">extraction</link>
+            </member>
+            <member>
+                <link linkend="matrix">matrix</link>
             </member>
             <member>
                 <link linkend="linspace">linspace</link>
@@ -162,4 +186,15 @@ A(i)
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                  <literal>%i:10</literal> теперь выдаёт ошибку.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 80db65f..eb05458 100644 (file)
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="comments">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ru" xml:id="comments">
     <refnamediv>
         <refname>комментарии</refname>
-        <refpurpose>(// or /*...*/) comments</refpurpose>
+        <refpurpose>(// или /*...*/) комментирование</refpurpose>
     </refnamediv>
     <refsection>
         <title>Описание</title>
@@ -12,9 +15,9 @@
             символы вплоть до конца строки, не интерпретируются.
         </para>
         <para>
-            Another way to comment a block of code is to use /* at the beginning
-            and */ at the end. It is more useful than // which must be positioned at the
-            beginning of each line to comment.
+            Другим способом закомментировать блок кода является использование <literal>/*</literal>
+            в начале и <literal>*/</literal> в конце блока. Это полезнее, чем <literal>//</literal>,
+            который должен ставиться в начале каждой строки, чтобы закомментировать.
         </para>
         <para>
             Внутри функции первые строки, вплоть до первой инструкции или пустой строки
@@ -28,9 +31,9 @@ g=9.81// ускорение свободного падения
 
 text='a//b'
 
-/* As this comment is quite long to be on many lines,
-the symbols slash and star to start the comment
-and star and slash to end the comment are used */
+/* Поскольку этот комментарий достаточно длинный, чтобы уместиться на множестве строк,
+то используются символы слеша и звёздочки для начала комментирования и
+звёздочка и слеш для завершения коментирования. */
 
 function y=myfunction(x)
   // myfunction вычисляет y=x^2+1
@@ -45,6 +48,9 @@ help myfunction
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
+                <link linkend="head_comments">head_comments</link>
+            </member>
+            <member>
                 <link linkend="slash">слэш</link>
             </member>
             <member>
@@ -52,4 +58,15 @@ help myfunction
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <literal>/* .. */</literal> вводит блок комментариев.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 316cf76..6aebb33 100644 (file)
@@ -292,7 +292,7 @@ type(r)                     // rational fractions
                 <link linkend="rational">rational</link>
             </member>
             <member>
-                <link linkend="mlist">tlist</link>
+                <link linkend="tlist">tlist</link>
             </member>
             <member>
                 <link linkend="mlist">mlist</link>
index e75faf0..a090d2a 100644 (file)
@@ -295,7 +295,7 @@ type(r)                     // Fractions polynomiales (rationnelles)
                 <link linkend="rational">rational</link>
             </member>
             <member>
-                <link linkend="mlist">tlist</link>
+                <link linkend="tlist">tlist</link>
             </member>
             <member>
                 <link linkend="mlist">mlist</link>
index 5750464..07f257e 100644 (file)
@@ -251,7 +251,7 @@ type(r)                     // rational fractions
                 <link linkend="rational">rational</link>
             </member>
             <member>
-                <link linkend="mlist">tlist</link>
+                <link linkend="tlist">tlist</link>
             </member>
             <member>
                 <link linkend="mlist">mlist</link>
index ca4e42e..ce39733 100644 (file)
@@ -203,7 +203,7 @@ type(r)                     // rational fractions
                 <link linkend="rational">rational</link>
             </member>
             <member>
-                <link linkend="mlist">tlist</link>
+                <link linkend="tlist">tlist</link>
             </member>
             <member>
                 <link linkend="mlist">mlist</link>
index d0cd9ab..9791abe 100644 (file)
@@ -290,7 +290,7 @@ type(r)                     // рациональные дроби
                 <link linkend="rational">rational</link>
             </member>
             <member>
-                <link linkend="mlist">tlist</link>
+                <link linkend="tlist">tlist</link>
             </member>
             <member>
                 <link linkend="mlist">mlist</link>
index fa5f12f..460c82c 100644 (file)
@@ -421,8 +421,9 @@ integer ny, ng
                                     <literal>6</literal> if <literal>info(8)=0</literal>, <literal>2</literal> otherwise),
                                 </para>
                                 <para>
-                                    - mxnh = maximum number of values of the artificial stepsize parameter <literal>h</literal> to be tried if info(7) &#8800; [] (default
-                                    <literal>5</literal>),
+                                    - mxnh = maximum number of values of the artificial stepsize
+                                       parameter <literal>h</literal> to be tried if info(7) ≠ []
+                                       (default <literal>5</literal>),
                                 </para>
                                 <para>
                                     - lsoff = flag to turn off the linesearch algorithm (lsoff = 0 means linesearch is on, lsoff = 1 means it is turned off)
index a21b223..a82ce66 100644 (file)
@@ -422,7 +422,7 @@ integer ny, ng
                                     <literal>6</literal> si <literal>info(8)=0</literal>, <literal>2</literal> sinon),
                                 </para>
                                 <para>
-                                    - mxnh = nombre maximal de valeurs artificielles du pas <literal>h</literal> à tenter si info(7) &#8800; [] (par défaut
+                                    - mxnh = nombre maximal de valeurs artificielles du pas <literal>h</literal> à tenter si info(7) ≠ [] (par défaut
                                     <literal>5</literal>),
                                 </para>
                                 <para>
index eb37dc0..2b289e7 100644 (file)
@@ -827,7 +827,7 @@ integer ny,ng
 
                                 <para>
 
-                                    - mxnh = info(7) &#8800; [] の場合に試行する人工的なステップサイズ
+                                    - mxnh = info(7) ≠ [] の場合に試行する人工的なステップサイズ
 
                                     パラメータHの最大値
 
index 9cdbedd..2384b7a 100644 (file)
         </para>
         <para>
             <warning>
-                Exponentiation is right-associative in Scilab contrarily to Matlab&#174; and Octave. For example 2^3^4 is equal to 2^(3^4) in Scilab but is equal to (2^3)^4 in Matlab&#174; and Octave.
+                Exponentiation is right-associative in Scilab contrarily to Matlab® and Octave.
+                For example 2^3^4 is equal to 2^(3^4) in Scilab but is equal to (2^3)^4 in Matlab®
+                and Octave.
             </warning>
         </para>
     </refsection>
index b6e3ade..55f081d 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="issquare" 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="issquare" xml:lang="en">
     <refnamediv>
         <refname>issquare</refname>
         <refpurpose>check if a variable is a square matrix</refpurpose>
         </para>
         <para>
             <note>
-                Note that <literal>issquare([])</literal> returns false.
+              <para>
+                <literal>issquare([])</literal> returns <literal>%F</literal> (false).
+              </para>
+              <para>
+                <literal>issquare(eye())</literal> returns <literal>%T</literal> (true).
+              </para>
             </note>
         </para>
     </refsection>
index 97892fe..35a759c 100644 (file)
             <member>
                 <link linkend="find">find</link>
             </member>
-        </simplelist>
-        <simplelist type="inline">
             <member>
                 <link linkend="overloading">overloading</link>
             </member>
index 3cdc23b..4872795 100644 (file)
@@ -71,7 +71,9 @@
         </para>
         <para>
             <warning>
-                L'élévation à la puissance est associative à droite dans Scilab contrairement à Matlab&#174; et Octave. Par exemple 2^3^4 est égal à 2^(3^4) dans Scilab mais est égal à (2^3)^4 dans Matlab&#174; et Octave.
+                L'élévation à la puissance est associative à droite dans Scilab contrairement à
+                Matlab® et Octave. Par exemple 2^3^4 est égal à 2^(3^4) dans Scilab mais est égal à
+                (2^3)^4 dans Matlab® et Octave.
             </warning>
         </para>
     </refsection>
index 1b908ab..0b5762d 100644 (file)
             <member>
                 <link linkend="find">find</link>
             </member>
-        </simplelist>
-        <simplelist type="inline">
             <member>
                 <link linkend="overloading">overloading</link>
             </member>
         </para>
     </refsection>
     <refsection>
-        <title>History</title>
+        <title>Historique</title>
         <revhistory>
             <revision>
                 <revnumber>5.4.0</revnumber>
-                <revremark>Cette fonction permet la surcharge pour les types non gérés (autres que vecteur ou matrice de nombres réels, entiers ou de chaînes de caractères ou vecteur creux).</revremark>
+                <revremark>Cette fonction peut être étendue aux types non gérés (autres que vecteur ou matrice de nombres réels, entiers ou de chaînes de caractères ou vecteur creux).</revremark>
             </revision>
         </revhistory>
     </refsection>
index 167bb98..ab513e6 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="issquare" xml:lang="ja">
+<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="issquare" xml:lang="ja">
 
     <refnamediv>
 
             <varname>x</varname> がハイパー行列の場合は要素数が1)
 
             の場合にtrueを返します.
-
-            <literal>issquare([])</literal>はfalseを返すことに注意してください.
-
         </para>
+      <note>
+        <para>
+          <literal>issquare([])</literal>はfalseを返すことに注意してください..
+        </para>
+        <para>
+          <literal>issquare(eye())</literal> returns <literal>%T</literal> (true).
+        </para>
+      </note>
 
     </refsection>
 
index 755e647..826e3c7 100644 (file)
                 <link linkend="find">find</link>
 
             </member>
-
-        </simplelist>
-
-        <simplelist type="inline">
-
             <member>
 
                 <link linkend="overloading">オーバーロード</link>
index aedb317..6005a85 100644 (file)
             <member>
                 <link linkend="find">find</link>
             </member>
+            <member>
+                <link linkend="overloading">overloading</link>
+            </member>
         </simplelist>
     </refsection>
     <refsection>
index edf2ece..ef70743 100644 (file)
             <member>
                 <link linkend="find">find</link>
             </member>
-        </simplelist>
-        <simplelist type="inline">
             <member>
-                <link linkend="overloading">overloading</link>
+                <link linkend="overloading">перегрузка</link>
             </member>
         </simplelist>
     </refsection>
index b5bea16..0b1d8a2 100644 (file)
@@ -17,7 +17,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="isdir">
     <refnamediv>
         <refname>isdir</refname>
-        <refpurpose>checks if argument is a directory path</refpurpose>
+        <refpurpose>checks that a path points to an existing directory</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
index 8856f3f..e57268f 100644 (file)
@@ -218,6 +218,9 @@ FILES = [SCI;SCIHOME;'not_exist_file';TMPDIR]
                 <link linkend="newest">newest</link>
             </member>
             <member>
+                <link linkend="isfile">isfile</link>
+            </member>
+            <member>
                 <link linkend="isdir">isdir</link>
             </member>
         </simplelist>
index 7614492..64e533e 100644 (file)
@@ -421,6 +421,9 @@ FILES = [SCI;SCIHOME;'not_exist_file';TMPDIR]
             </member>
 
             <member>
+                <link linkend="isfile">isfile</link>
+            </member>
+            <member>
 
                 <link linkend="isdir">isdir</link>
 
index d4c9884..d07fdfe 100644 (file)
@@ -197,6 +197,9 @@ end
                 <link linkend="newest">newest</link>
             </member>
             <member>
+                <link linkend="isfile">isfile</link>
+            </member>
+            <member>
                 <link linkend="isdir">isdir</link>
             </member>
         </simplelist>
index 6c80b18..4f5cba2 100644 (file)
@@ -224,6 +224,9 @@ FILES = [SCI;SCIHOME;'несуществующий_файл';TMPDIR]
                 <link linkend="newest">newest</link>
             </member>
             <member>
+                <link linkend="isfile">isfile</link>
+            </member>
+            <member>
                 <link linkend="isdir">isdir</link>
             </member>
         </simplelist>
index e5b5ee9..cc9fc3b 100644 (file)
@@ -56,6 +56,9 @@
             <member>
                 <link linkend="librarieslist">librarieslist</link>
             </member>
+            <member>
+                <link linkend="whereis">whereis</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index cd1243e..5bf15e7 100644 (file)
                 <link linkend="librarieslist">librarieslist</link>
 
             </member>
+            <member>
+                <link linkend="whereis">whereis</link>
+            </member>
 
         </simplelist>
 
index be1b5d7..8817fe8 100644 (file)
@@ -2,23 +2,23 @@
 <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="libraryinfo" xml:lang="pt">
     <refnamediv>
         <refname>libraryinfo</refname>
-        <refpurpose>retorna macros e endereço de uma biblioteca
+        <refpurpose>retorna macros e endereço de uma biblioteca
             Scilab
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>macros = libraryinfo(libraryname)
             [macros,path] = libraryinfo(libraryname)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>macros</term>
                 <listitem>
-                    <para>uma matriz de strings (todas as funções principais da
+                    <para>uma matriz de strings (todas as funções principais da
                         biblioteca)
                     </para>
                 </listitem>
@@ -28,7 +28,7 @@
             <varlistentry>
                 <term>path</term>
                 <listitem>
-                    <para>um string (endereço da biblioteca)</para>
+                    <para>um string (endereço da biblioteca)</para>
                 </listitem>
             </varlistentry>
         </variablelist>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>Retorna nomes de funções e o endereço de uma biblioteca Scilab. Os
-            nomes de funções são aqueles que correspondem aos nomes de arquivo
-            associados .sci ou .bin. Os outros são funções subsidiárias.
+        <title>Descrição</title>
+        <para>Retorna nomes de funções e o endereço de uma biblioteca Scilab. Os
+            nomes de funções são aqueles que correspondem aos nomes de arquivo
+            associados .sci ou .bin. Os outros são funções subsidiárias.
         </para>
     </refsection>
     <refsection>
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="librarieslist">librarieslist</link>
             </member>
+            <member>
+                <link linkend="whereis">whereis</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 533bd57..6d09589 100644 (file)
@@ -3,7 +3,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Djalel Abdemouche
  * Copyright (C) 2009 - DIGITEO - Pierre Lando
- * Copyright (C) 2013 - Samuel GOUGEON : revision for x|y|z_ticks and "See also" sections
+ * Copyright (C) 2013, 2018 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * 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="axes_properties">
+<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="axes_properties">
     <refnamediv>
         <refname>axes properties</refname>
         <refpurpose>
                             <term>auto_ticks: </term>
                             <listitem>
                                 <para>
-                                    A <literal>1x3</literal> string vector giving the auto_ticks status
-                                    for each axis. This property specifies whether each axis is
-                                    graduated using a computational algorithm or not (graduations are
-                                    set by the user). Its value should be <literal>"on"</literal> or
-                                    <literal>"off"</literal> for a global setting.To act on a single axis,
-                                    the syntax is <literal>auto_ticks(N)</literal> where <literal>N</literal> is
-                                    <literal>1,2</literal> or <literal>3</literal> corresponding to the
-                                    <literal>x,y</literal> or <literal>z</literal> axis. Note that editing ticks
-                                    (text and/or locations) via <literal>x_ticks, y_ticks</literal> or
-                                    <literal>z_ticks</literal> automatically set <literal>auto_ticks</literal> to
-                                    <literal>"off"</literal> for the corresponding axes.
+                                    Default <literal>["on" "on" "on"]</literal>. auto_ticks status
+                                    for each x, y and z respective axis.
                                 </para>
+                                <para>
+                                    <literal>"on"</literal> means that the axis is automatically
+                                    graduated through a
+                                    computational algorithm. Then, resizing the figure and axes
+                                    automatically updates accordingly graduations ticks and labels
+                                    of the given axis.
+                               </para>
+                               <para>
+                                    On the contrary, <literal>"off"</literal> means that graduations
+                                    ticks or/and labels are set by hand. Then resizing the figure and
+                                    axes has no effect on existing graduations ticks and labels.
+                              </para>
+                              <para>Setting <literal>.auto_ticks="on"</literal> or <literal>"off"</literal>
+                                sets the same status for the x, y and z axes. Setting
+                                <literal>.auto_ticks(2)="off"</literal> sets the status only for the
+                                y axis. Etc.
+                              </para>
+                              <warning>
+                                Editing ticks (labels and/or locations) via
+                                <literal>x_ticks, y_ticks</literal> or  <literal>z_ticks</literal>
+                                automatically sets <literal>auto_ticks</literal> to <literal>"off"</literal>
+                                for the corresponding axes.
+                              </warning>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         <varlistentry>
                                             <term>Labels</term>
                                             <listitem>
-                                                is a text vector containing the labels to be displayed in front of each related graduation. As for Locations of ticks, Labels can be addressed with (e.g. along y) <literal>Haxes.y_ticks.labels = Labels</literal> or <literal>Haxes.y_ticks.labels(j) = newLabelJ</literal>
+                                                is a text vector containing the labels to be displayed
+                                                in front of each related graduation. As for Locations
+                                                of ticks, Labels can be addressed with (e.g. along y)
+                                                <literal>Haxes.y_ticks.labels = Labels</literal> or
+                                                <literal>Haxes.y_ticks.labels(j) = newLabelJ</literal>
                                             </listitem>
                                         </varlistentry>
                                     </variablelist>
                                     <warning>
-                                        <para>
-                                            For an axis, <literal>Locations</literal> and <literal>Labels</literal> vectors must have the same number of components.
-                                        </para>
-                                        <para>
-                                            When the number of ticks must be changed, their positions AND labels must be changed at once, in order to avoid any mismatch: The syntax (e.g. along x) <literal>Haxes.x_ticks = tlist(["ticks" "locations", "labels"], newLocations, newLabels)</literal> must then be used.
-                                        </para>
+                                        <itemizedlist>
+                                        <listitem>
+                                            For an axis, <literal>Locations</literal> and
+                                            <literal>Labels</literal> vectors must have the same
+                                            number of components.
+                                        </listitem>
+                                        <listitem>
+                                            When the number of ticks must be changed, their positions
+                                            AND labels must be changed at once, in order to avoid
+                                            any mismatch: The syntax (e.g. along x)
+                                            <literal>Haxes.x_ticks = tlist(["ticks" "locations", "labels"], newLocations, newLabels)</literal>
+                                            must then be used.
+                                        </listitem>
+                                        <listitem>
+                                            Changing by hand the <literal>Locations</literal> or/and
+                                            <literal>Labels</literal> of an axis automatically sets
+                                            its <literal>.auto_ticks</literal> status to
+                                            <literal>"off"</literal>. This cancels its
+                                            auto-regraduation under resizing of the figure.
+                                        </listitem>
+                                      </itemizedlist>
                                     </warning>
                                 </para>
                             </listitem>
                             <term>x_ticks.locations, y_ticks.locations, z_ticks.locations: </term>
                             <listitem>
                                 <para>
-                                    Each of these properties is a real vector containing the locations of graduations on the related x or y or z axis. <varname>x_ticks.locations</varname> must have the same number of components as <varname>x_ticks.labels</varname>. See <varname>x_ticks</varname> hereabove for more details.
+                                    Each of these properties is a real vector containing the locations
+                                  of graduations on the related x or y or z axis.
+                                  <varname>x_ticks.locations</varname> must have the same number of
+                                  components as <varname>x_ticks.labels</varname>.
+                                  See <varname>x_ticks</varname> hereabove for more details.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>x_ticks.labels, y_ticks.labels, z_ticks.labels: </term>
                             <listitem>
                                 <para>
-                                    Each of these properties is a text vector containing the labels to be displayed in front of ticks on the related x or y or z axis. <varname>x_ticks.labels</varname> must have the same number of components as <varname>x_ticks.locations</varname>. See <varname>x_ticks</varname> hereabove for more details.
+                                  Each of these properties is a text vector containing the labels
+                                  to be displayed in front of ticks on the related x or y or z axis.
+                                  <varname>x_ticks.labels</varname> must have the same number of
+                                  components as <varname>x_ticks.locations</varname>.
+                                  See <varname>x_ticks</varname> hereabove for more details.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <listitem>
                                 <para>
                                     This property specifies the format to use for each axes.
-                                    It is a row vector with at most 3 columns containing strings format (as specified for <link linkend="mprintf">mprintf</link>). Each ticks position will be used to format the string used as label.
+                                    It is a row vector with at most 3 columns containing strings
+                                    format (as specified for <link linkend="mprintf">mprintf</link>).
+                                    Each ticks position will be used to format the string used as label.
                                 </para>
                                 <para>
-                                    So, for example ticks_format="%.2e" will print ticks positions in using scientific notation with two decimals.
+                                    So, for example ticks_format="%.2e" will print ticks positions
+                                    in using scientific notation with two decimals.
                                 </para>
+                                <warning>
+                                   Labels are actually updated according to the newly set
+                                   <literal>.ticks_format(i)</literal> only if the
+                                   <literal>.auto_ticks(i)</literal> status of the axis #i is
+                                   <literal>"on"</literal>. Otherwise,
+                                   <literal>.ticks_format(i)</literal> is recorded without being
+                                   immediately used.
+                                </warning>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>ticks_st: </term>
                             <listitem>
                                 <para>
-                                    This property specifies scale-translate factors to apply to each ticks position before to use it in the formatted string used as label. So if the factors are <literal>[x_s y_s z_s ; x_t y_t z_t]</literal> and if a x_tick is positioned at X, the value used to format the label will be <literal>x_s*(X-x_t)</literal>. It could be particularly useful when the axes bounds are too closed.
+                                  This property specifies scale-translate factors to apply to each
+                                  ticks position before to use it in the formatted string used as
+                                  label. So if the factors are
+                                  <literal>[x_s y_s z_s ; x_t y_t z_t]</literal> and if a x_tick is
+                                  positioned at X, the value used to format the label will be
+                                  <literal>x_s*(X-x_t)</literal>. It could be particularly useful
+                                  when the axes bounds are too closed.
                                     <para>
                                         It is a matrix with 2 rows and at most 3 columns.
                                     </para>
                                 </para>
                                 <para>
-                                    So, for example <literal>base=B</literal>, labels could be printed with <literal>ticks_format=string(base)+"%+.2e"</literal> and <literal>ticks_st=[1 base]</literal>
+                                    So, for example <literal>base=B</literal>, labels could be
+                                    printed with <literal>ticks_format=string(base)+"%+.2e"</literal>
+                                    and <literal>ticks_st=[1 base]</literal>
                                 </para>
                             </listitem>
                         </varlistentry>
@@ -1041,15 +1104,17 @@ a.ticks_st=[1 1;0 m(2)];
         <revhistory>
             <revision>
                 <revnumber>5.4.0</revnumber>
-                <revremark>line_style value 0 is obsolete, use 1 instead (both are equivalent for SOLID). Using value 0 will produce an error in Scilab 5.4.1.</revremark>
+                <revremark>line_style value 0 is obsolete, use 1 instead (both are equivalent for SOLID).
+                  Using value 0 will produce an error in Scilab 5.4.1.</revremark>
             </revision>
             <revision>
                 <revnumber>5.5.0</revnumber>
                 <revremark>
                     <itemizedlist>
-                        <listitem>line_style values 9 and 10 can be used to have respectively longblank dot and bigblank dot styles.</listitem>
-                        <listitem>auto_margins property added to allow automatic computation of the margins.</listitem>
-                        <listitem>ticks_format and ticks_st properties added to improve ticks labels display.</listitem>
+                        <listitem>.grid_style property added.</listitem>
+                        <listitem>.line_style values 9 and 10 can be used to have respectively long blank dot and bigblank dot styles.</listitem>
+                        <listitem>.auto_margins property added to allow automatic computation of the margins.</listitem>
+                        <listitem>.ticks_format and .ticks_st properties added to improve ticks labels display.</listitem>
                     </itemizedlist>
                 </revremark>
             </revision>
                     <para>
                         <inlinemediaobject>
                             <imageobject>
-                                <imagedata fileref="../images/marks.svg"/>
+                                <imagedata fileref="../../images/marks.svg"/>
                             </imageobject>
                         </inlinemediaobject>
                     </para>
diff --git a/scilab/modules/graphics/help/images/plot3d_patch.png b/scilab/modules/graphics/help/images/plot3d_patch.png
deleted file mode 100644 (file)
index 660b90a..0000000
Binary files a/scilab/modules/graphics/help/images/plot3d_patch.png and /dev/null differ
diff --git a/scilab/modules/graphics/help/images/plot3d_patch_vertex.png b/scilab/modules/graphics/help/images/plot3d_patch_vertex.png
deleted file mode 100644 (file)
index 35eab7d..0000000
Binary files a/scilab/modules/graphics/help/images/plot3d_patch_vertex.png and /dev/null differ
index f13756d..31d611c 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="axes_properties">
+<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="axes_properties">
     <refnamediv>
         <refname>axes_properties</refname>
         <refpurpose>axesエンティティプロパティの説明</refpurpose>
                                         </varlistentry>
                                     </variablelist>
                                     <warning>
-                                        <para>
+                                      <itemizedlist>
+                                        <listitem>
                                             ある軸について, <literal>Locations</literal>及び<literal>Labels</literal>
                                             ベクトルの要素の数は同じとする必要があります.
-                                        </para>
-                                        <para>
+                                        </listitem>
+                                        <listitem>
                                             目盛の数が変更となった場合,不整合を回避するために
                                             各目盛の位置とラベルを同時に変更する必要があります:
                                             (例えばx軸に関して)構文
                                             <literal>Haxes.x_ticks = tlist(["ticks" "locations", "labels"], newLocations, newLabels)</literal> を使用します.
-                                        </para>
+                                        </listitem>
+                                        <listitem>
+                                            Changing by hand the <literal>Locations</literal> or/and
+                                            <literal>Labels</literal> of an axis automatically sets
+                                            its <literal>.auto_ticks</literal> status to
+                                            <literal>"off"</literal>. This cancels its
+                                            auto-regraduation under resizing of the figure.
+                                        </listitem>
+                                      </itemizedlist>
                                     </warning>
                                 </para>
                             </listitem>
                                     ここで,例えば ticks_format="%.2e" は,目盛の位置を10進2桁指数表記
                                     により出力します.
                                 </para>
+                                <warning>
+                                   Labels are actually updated according to the newly set
+                                   <literal>.ticks_format(i)</literal> only if the
+                                   <literal>.auto_ticks(i)</literal> status of the axis #i is
+                                   <literal>"on"</literal>. Otherwise, the new
+                                   <literal>.ticks_format(i)</literal> format is recorded without
+                                   being immediately used.
+                                </warning>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -1070,13 +1090,14 @@ a.ticks_st=[1 1;0 m(2)];
                 <revnumber>5.5.0</revnumber>
                 <revremark>
                     <itemizedlist>
-                        <listitem>line_style の値 9 と 10 を使用でき,
+                        <listitem>.grid_style property added.</listitem>
+                        <listitem>.line_style の値 9 と 10 を使用でき,
                             それぞれlongblank dot および bigblank dot 形式を意味します.
                         </listitem>
-                        <listitem>auto_margins プロパティが追加され,
+                        <listitem>.auto_margins プロパティが追加され,
                             マージンの自動計算が可能になりました.
                         </listitem>
-                        <listitem>ticks_format と ticks_st プロパティが追加され,
+                        <listitem>.ticks_format と .ticks_st プロパティが追加され,
                             目盛ラベルの表示が改善されました.
                         </listitem>
                     </itemizedlist>
 
                             <imageobject>
 
-                                <imagedata fileref="../images/marks.svg"/>
+                              <imagedata fileref="../../images/marks.svg"/>
 
                             </imageobject>
 
index badd18f..5460e0d 100644 (file)
@@ -1,8 +1,9 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) 2007-2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
 // Copyright (C) 2017 - Samuel GOUGEON
 //
+// 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,
index 7c6eb13..8c7dc11 100644 (file)
@@ -805,8 +805,9 @@ bode_fr_FR_3.png=29f4cadff9611f6dab32471429e7bdf7
 bode_ja_JP_1.png=87ec396c51a7cc6aafb148e1aa5f9256
 bode_ja_JP_2.png=95d29219903b7e027aef6a1618855bc0
 bode_ja_JP_3.png=29f4cadff9611f6dab32471429e7bdf7
-bode_pt_BR_1.png=87ec396c51a7cc6aafb148e1aa5f9256
-bode_pt_BR_2.png=95d29219903b7e027aef6a1618855bc0
+bode_pt_BR_1.png=5d7c38b094cee911ec2cc42dd7050176
+bode_pt_BR_2.png=3a40a98fd3fb7a58e9f8282a4b515f71
+bode_pt_BR_3.png=29f4cadff9611f6dab32471429e7bdf7
 bode_ru_RU_1.png=5d7c38b094cee911ec2cc42dd7050176
 bode_ru_RU_2.png=3a40a98fd3fb7a58e9f8282a4b515f71
 bode_ru_RU_3.png=29f4cadff9611f6dab32471429e7bdf7
diff --git a/scilab/modules/helptools/images/bode_ja_JP_3.png b/scilab/modules/helptools/images/bode_ja_JP_3.png
new file mode 100644 (file)
index 0000000..e8a8804
Binary files /dev/null and b/scilab/modules/helptools/images/bode_ja_JP_3.png differ
index d95b611..1603118 100644 (file)
Binary files a/scilab/modules/helptools/images/bode_pt_BR_1.png and b/scilab/modules/helptools/images/bode_pt_BR_1.png differ
index 3389106..7ecf418 100644 (file)
Binary files a/scilab/modules/helptools/images/bode_pt_BR_2.png and b/scilab/modules/helptools/images/bode_pt_BR_2.png differ
diff --git a/scilab/modules/helptools/images/bode_pt_BR_3.png b/scilab/modules/helptools/images/bode_pt_BR_3.png
new file mode 100644 (file)
index 0000000..e8a8804
Binary files /dev/null and b/scilab/modules/helptools/images/bode_pt_BR_3.png differ
index 1788bb0..e5e0808 100644 (file)
@@ -52,7 +52,9 @@
         </para>
         <para>
             <warning>
-                Exponentiation is right-associative in Scilab contrarily to Matlab&#174; and Octave. For example 2^3^4 is equal to 2^(3^4) in Scilab but is equal to (2^3)^4 in Matlab&#174; and Octave.
+                Exponentiation is right-associative in Scilab contrarily to Matlab® and Octave.
+                For example 2^3^4 is equal to 2^(3^4) in Scilab but is equal to (2^3)^4 in Matlab®
+                and Octave.
             </warning>
         </para>
     </refsection>
index 55b5752..574634e 100644 (file)
@@ -258,45 +258,45 @@ nm = neldermead_destroy(nm);
     </refsection>
     <refsection>
         <title>Bibliography</title>
-        <para>&#8220;Sequential Application of Simplex Designs in Optimisation and
-            Evolutionary Operation&#8221;, Spendley, W. and Hext, G. R. and Himsworth,
+        <para>"Sequential Application of Simplex Designs in Optimisation and
+            Evolutionary Operation", Spendley, W. and Hext, G. R. and Himsworth,
             F. R., American Statistical Association and American Society for Quality,
             1962
         </para>
-        <para>&#8220;A Simplex Method for Function Minimization&#8221;, Nelder, J.
+        <para>"A Simplex Method for Function Minimization", Nelder, J.
             A. and Mead, R., The Computer Journal, 1965
         </para>
         <para>"A New Method of Constrained Optimization and a Comparison With
             Other Methods", M. J. Box, The Computer Journal 1965 8(1):42-52, 1965 by
             British Computer Society
         </para>
-        <para>&#8220;Convergence Properties of the Nelder--Mead Simplex Method in
-            Low Dimensions&#8221;, Jeffrey C. Lagarias and James A. Reeds and Margaret
+        <para>"Convergence Properties of the Nelder--Mead Simplex Method in
+            Low Dimensions", Jeffrey C. Lagarias and James A. Reeds and Margaret
             H. Wright and Paul E. Wright, SIAM Journal on Optimization, 1998
         </para>
-        <para>&#8220;Compact numerical methods for computers : linear algebra and
-            function minimisation&#8221;, Nash, J. C., Hilger, Bristol, 1979
+        <para>"Compact numerical methods for computers : linear algebra and
+            function minimisation", Nash, J. C., Hilger, Bristol, 1979
         </para>
-        <para>&#8220;Iterative Methods for Optimization&#8221;, C. T. Kelley,
+        <para>"Iterative Methods for Optimization", C. T. Kelley,
             1999
         </para>
-        <para>&#8220;Iterative Methods for Optimization: Matlab Codes&#8221;,
+        <para>"Iterative Methods for Optimization: Matlab Codes",
             http://www4.ncsu.edu/~ctk/matlab_darts.html
         </para>
-        <para>&#8220;Sequential Simplex Optimization: A Technique for Improving
+        <para>"Sequential Simplex Optimization: A Technique for Improving
             Quality and Productivity in Research, Development, and
-            Manufacturing&#8221;, Walters, Fred H. and Jr, Lloyd R. and Morgan,
+            Manufacturing", Walters, Fred H. and Jr, Lloyd R. and Morgan,
             Stephen L. and Deming, Stanley N., 1991
         </para>
-        <para>&#8220;Numerical Recipes in C, Second Edition&#8221;, W. H. Press
+        <para>"Numerical Recipes in C, Second Edition", W. H. Press
             and Saul A. Teukolsky and William T. Vetterling and Brian P. Flannery,
             1992
         </para>
-        <para>&#8220;Detection and Remediation of Stagnation in the Nelder--Mead
-            Algorithm Using a Sufficient Decrease Condition&#8221;, SIAM J. on
+        <para>"Detection and Remediation of Stagnation in the Nelder--Mead
+            Algorithm Using a Sufficient Decrease Condition", SIAM J. on
             Optimization, Kelley,, C. T., 1999
         </para>
-        <para>Matlab &#8211; fminsearch ,
+        <para>Matlab ® fminsearch ,
             http://www.mathworks.com/access/helpdesk/help/techdoc/index.html?/access/helpdesk/help/techdoc/ref/fminsearch.html
         </para>
         <para>GAMS, A19A20 - description,
@@ -309,8 +309,8 @@ nm = neldermead_destroy(nm);
             http://www.stat.uconn.edu/~mhchen/survbook/example51/optim1.f
         </para>
         <para>as47,f, http://lib.stat.cmu.edu/apstat/47</para>
-        <para>&#8220;Algorithm AS47 - Function minimization using a simplex
-            procedure, O'Neill, R., 1971, Applied Statistics
+        <para>"Algorithm AS47 - Function minimization using a simplex procedure", O'Neill, R.,
+          1971, Applied Statistics
         </para>
     </refsection>
 </refentry>
index 777d272..b0594e8 100644 (file)
@@ -213,8 +213,8 @@ s1 = optimsimplex_destroy ( s1 );
     <refsection>
         <title>Bibliography</title>
         <para>
-            &#8220;Sequential Application of Simplex Designs in Optimisation and
-            Evolutionary Operation&#8221;, Spendley, W. and Hext, G. R. and Himsworth,
+            "Sequential Application of Simplex Designs in Optimisation and
+            Evolutionary Operation", Spendley, W. and Hext, G. R. and Himsworth,
             F. R., American Statistical Association and American Society for Quality,
             1962
         </para>
@@ -247,18 +247,18 @@ s1 = optimsimplex_destroy ( s1 );
             British Computer Society
         </para>
         <para>
-            &#8220;Detection and Remediation of Stagnation in the Nelder--Mead
-            Algorithm Using a Sufficient Decrease Condition&#8221;, SIAM J. on
+            "Detection and Remediation of Stagnation in the Nelder--Mead
+            Algorithm Using a Sufficient Decrease Condition", SIAM J. on
             Optimization, Kelley,, C. T., 1999
         </para>
         <para>
-            " Multi-Directional Search: A Direct Search Algorithm for Parallel
+            "Multi-Directional Search: A Direct Search Algorithm for Parallel
             Machines", by E. Boyd, Kenneth W. Kennedy, Richard A. Tapia, Virginia
             Joanne Torczon,, Virginia Joanne Torczon, 1989, Phd Thesis, Rice
             University
         </para>
         <para>
-            "Grid Restrained Nelder-Mead Algorithm", Árpád B&#361;rmen, Janez
+            "Grid Restrained Nelder-Mead Algorithm", Árpád Bũrmen, Janez
             Puhan, Tadej Tuma, Computational Optimization and Applications, Volume 34
             , Issue 3 (July 2006), Pages: 359 - 375
         </para>
index 8f71a63..b1eefc2 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="ldiv">
+<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="ldiv">
     <refnamediv>
         <refname>ldiv</refname>
         <refpurpose>polynomial matrix long division</refpurpose>
@@ -74,6 +77,9 @@ x3 = ldiv(wtfbis.num, wtfbis.den, 5)
                 <link linkend="markp2ss">markp2ss</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="pdiv">pdiv</link>
             </member>
         </simplelist>
index f70b8fc..456664f 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="pdiv">
+<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="pdiv">
     <refnamediv>
         <refname>pdiv</refname>
         <refpurpose>polynomial division</refpurpose>
@@ -75,6 +78,9 @@ p2*q+r-p1
                 <link linkend="ldiv">ldiv</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="gcd">gcd</link>
             </member>
         </simplelist>
index 7bac9dd..d6679ff 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="ldiv">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="fr" xml:id="ldiv">
     <refnamediv>
         <refname>ldiv</refname>
         <refpurpose>division longue d'une matrice de polynômes  </refpurpose>
@@ -62,6 +65,9 @@ x3 = ldiv(wtfbis.num, wtfbis.den, 5)
                 <link linkend="markp2ss">markp2ss</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="pdiv">pdiv</link>
             </member>
         </simplelist>
index fb5fc49..ea07f49 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="pdiv">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="fr" xml:id="pdiv">
     <refnamediv>
         <refname>pdiv</refname>
         <refpurpose>division de polynômes  </refpurpose>
@@ -64,6 +67,9 @@ p2*q+r-p1
                 <link linkend="ldiv">ldiv</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="gcd">gcd</link>
             </member>
         </simplelist>
index 474daf8..39be764 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="ldiv">
+<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="ldiv">
     <refnamediv>
         <refname>ldiv</refname>
         <refpurpose>多項式行列の長除算</refpurpose>
@@ -76,6 +79,9 @@ x3 = ldiv(wtfbis.num, wtfbis.den, 5)
                 <link linkend="markp2ss">markp2ss</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="pdiv">pdiv</link>
             </member>
         </simplelist>
index 8b5d433..e0c2630 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="pdiv">
+<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="pdiv">
     <refnamediv>
         <refname>pdiv</refname>
         <refpurpose>多項式の除算</refpurpose>
@@ -78,6 +81,9 @@ p2*q+r-p1
                 <link linkend="ldiv">ldiv</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="gcd">gcd</link>
             </member>
         </simplelist>
index 80550b9..2a98c78 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="ldiv" xml:lang="pt">
+<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="ldiv" xml:lang="pt">
     <refnamediv>
         <refname>ldiv</refname>
         <refpurpose>divisão longa entre matrizes de polinômios</refpurpose>
@@ -76,6 +79,9 @@ x3 = ldiv(wtfbis.num, wtfbis.den, 5)
                 <link linkend="markp2ss">markp2ss</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="pdiv">pdiv</link>
             </member>
         </simplelist>
index b8960c6..25a5f83 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="pdiv" xml:lang="pt">
+<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="pdiv" xml:lang="pt">
     <refnamediv>
         <refname>pdiv</refname>
-        <refpurpose>divisão polinomial</refpurpose>
+        <refpurpose>divisão polinomial</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title> Seqüência de Chamamento </title>
+        <title> Seqüência de Chamamento </title>
         <synopsis>[R,Q]=pdiv(P1,P2)
             [Q]=pdiv(P1,P2)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>P1</term>
                 <listitem>
-                    <para>matriz de polinômios </para>
+                    <para>matriz de polinômios </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>P2</term>
                 <listitem>
-                    <para>polinômio ou matriz de polinômios</para>
+                    <para>polinômio ou matriz de polinômios</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>R,Q</term>
                 <listitem>
-                    <para>duas matrizes de polinômios</para>
+                    <para>duas matrizes de polinômios</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>Divisão euclidiana elemento a elemento da matriz de polinômios
-            <literal>P1</literal> pelo polinômio <literal>P2</literal> ou pela matriz
-            de polinômios <literal>P2</literal>. <literal>Rij</literal> é a matriz de
-            restos, <literal>Qij</literal> é a matriz de quocientes e <literal>P1ij =
+        <title>Descrição</title>
+        <para>Divisão euclidiana elemento a elemento da matriz de polinômios
+            <literal>P1</literal> pelo polinômio <literal>P2</literal> ou pela matriz
+            de polinômios <literal>P2</literal>. <literal>Rij</literal> é a matriz de
+            restos, <literal>Qij</literal> é a matriz de quocientes e <literal>P1ij =
                 Qij*P2 + Rij
             </literal>
             ou <literal>P1ij = Qij*P2ij + Rij</literal>.
@@ -71,12 +74,15 @@ p2*q+r-p1
  ]]></programlisting>
     </refsection>
     <refsection>
-        <title> Ver Também </title>
+        <title> Ver Também </title>
         <simplelist type="inline">
             <member>
                 <link linkend="ldiv">ldiv</link>
             </member>
             <member>
+                <link linkend="pfss">pfss</link>
+            </member>
+            <member>
                 <link linkend="gcd">gcd</link>
             </member>
         </simplelist>
index 80ccd08..27825ae 100644 (file)
  * along with this program.
 *
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="prefs_SciNotes" scilab:needs-examples="no" 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="prefs_SciNotes" scilab:needs-examples="no" xml:lang="en">
     <refnamediv>
         <refname>SciNotes preferences</refname>
         <refpurpose>SciNotes general preferences</refpurpose>
@@ -23,7 +26,7 @@
         <para>
             <inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/scinotes/editor.png" width="100" depth="100" scalefit="0" align="center" valign="middle"/>
+                    <imagedata fileref="../images/scinotes/editor.png" align="center" valign="middle"/>
                 </imageobject>
             </inlinemediaobject>
         </para>
@@ -55,7 +58,7 @@
         <para>
             <inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/scinotes/scinotes_general_settings.png" width="100" depth="100" scalefit="0" align="center" valign="middle"/>
+                    <imagedata fileref="../images/scinotes/scinotes_general_settings.png" align="center" valign="middle"/>
                 </imageobject>
             </inlinemediaobject>
         </para>
index 736daa8..fdeefb4 100644 (file)
  * along with this program.
 *
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="prefs_SciNotes" scilab:needs-examples="no" xml:lang="ja">
+<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="prefs_SciNotes" scilab:needs-examples="no"
+          xml:lang="ja">
     <refnamediv>
         <refname>SciNotes preferences</refname>
         <refpurpose>SciNotes 一般設定</refpurpose>
@@ -23,7 +27,7 @@
         <para>
             <inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/scinotes/editor.png" width="100" depth="100" scalefit="0" align="center" valign="middle"/>
+                    <imagedata fileref="../images/scinotes/editor.png" align="center" valign="middle"/>
                 </imageobject>
             </inlinemediaobject>
         </para>
@@ -65,7 +69,7 @@
         <para>
             <inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/scinotes/scinotes_general_settings.png" width="100" depth="100" scalefit="0" align="center" valign="middle"/>
+                    <imagedata fileref="../images/scinotes/scinotes_general_settings.png" align="center" valign="middle"/>
                 </imageobject>
             </inlinemediaobject>
         </para>
index b50dabb..915daa0 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="cspect" 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="cspect" xml:lang="en">
     <refnamediv>
         <refname>cspect</refname>
         <refpurpose>two sided cross-spectral estimate between 2 discrete time signals using
@@ -28,7 +31,7 @@
                     <para>
                         vector, the data of the second signal. If <literal>y</literal>
                         is omitted it is supposed to be equal to <literal>x</literal>
-                        (auto-correlation). If it is present, it must have the same numer of
+                        (auto-correlation). If it is present, it must have the same number of
                         element than <literal>x.</literal>
                     </para>
                 </listitem>
index 69aeba5..0e3e6d5 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="pspect" 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="pspect" xml:lang="en">
     <refnamediv>
         <refname>pspect</refname>
         <refpurpose>two sided cross-spectral estimate between 2 discrete time signals using
@@ -28,7 +31,7 @@
                     <para>
                         vector, the time-domain samples of the second signal. If <literal>y</literal>
                         is omitted it is supposed to be equal to <literal>x</literal>
-                        (auto-correlation). If it is present, it must have the same numer of
+                        (auto-correlation). If it is present, it must have the same number of
                         element than <literal>x</literal>.
                     </para>
                 </listitem>
diff --git a/scilab/modules/signal_processing/help/fr_FR/spectral_estimation/cspect.xml b/scilab/modules/signal_processing/help/fr_FR/spectral_estimation/cspect.xml
deleted file mode 100644 (file)
index 75e8fd3..0000000
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="cspect" xml:lang="fr">
-    <refnamediv>
-        <refname>cspect</refname>
-        <refpurpose>two sided cross-spectral estimate between 2 discrete time signals using
-            the correlation method
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            [sm [,cwp]]=cspect(nlags,npoints,wtype,x [,y] [,wpar])
-            [sm [,cwp]]=cspect(nlags,npoints,wtype,nx [,ny] [,wpar])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>vector, the data of the first signal.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>y</term>
-                <listitem>
-                    <para>
-                        vector, the data of the second signal. If <literal>y</literal>
-                        is omitted it is supposed to be equal to <literal>x</literal>
-                        (auto-correlation). If it is present, it must have the same numer of
-                        element than <literal>x.</literal>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>nx</term>
-                <listitem>
-                    <para>
-                        a scalar : the number of points in the <literal>x</literal>
-                        signal. In this case the segments of the x signal are loaded by a
-                        user defined function named <literal>getx</literal> (see
-                        below).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ny</term>
-                <listitem>
-                    <para>a scalar : the number of points in the
-                        <literal>y</literal> signal. In this case the segments of
-                        the <literal>y</literal> signal are loaded by a user defined
-                        function named <literal>gety</literal> (see below). If
-                        present <literal>ny</literal> must be equal to
-                        <literal>nx</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>nlags</term>
-                <listitem>
-                    <para>number of correlation lags (positive integer)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>npoints</term>
-                <listitem>
-                    <para>number of transform points (positive integer)</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>wtype</term>
-                <listitem>
-                    <para>The window type</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <literal>'re'</literal>: rectangular
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'tr'</literal>: triangular
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'hm'</literal>: Hamming
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'hn'</literal>: Hann
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'kr'</literal>: Kaiser,in this case the wpar
-                                argument must be given
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'ch'</literal>: Chebyshev, in this case the wpar
-                                argument must be given
-                            </para>
-                        </listitem>
-                    </itemizedlist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>wpar</term>
-                <listitem>
-                    <para>
-                        optional parameters for <literal>Kaiser and Chebyshev
-                            windows:
-                        </literal>
-                    </para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                'kr': <literal>wpar must be a strictly positive
-                                    number
-                                </literal>
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                'ch': <literal>wpar</literal> must be a 2 element vector
-                                <literal> [main_lobe_width,side_lobe_height]with
-                                </literal>
-                                <literal>0&lt;main_lobe_width&lt;.5</literal>, and
-                                <literal>side_lobe_height&gt;0</literal>
-                            </para>
-                        </listitem>
-                    </itemizedlist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>sm</term>
-                <listitem>
-                    <para>The power spectral estimate in the interval
-                        <literal>[0,1]</literal> of the normalized frequencies. It
-                        is a row array of size <literal>npoints</literal>. The array
-                        is real in case of auto-correlation and complex in case of
-                        cross-correlation.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>cwp</term>
-                <listitem>
-                    <para>the unspecified Chebyshev window parameter in case of Chebyshev
-                        windowing, or an empty matrix.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>Computes the cross-spectrum estimate of two signals
-            <literal>x</literal> and <literal>y</literal> if both are given and the
-            auto-spectral estimate of <literal>x</literal> otherwise. Spectral
-            estimate obtained using the correlation method.
-        </para>
-        <para>The cross spectrum of two signal x and y is defined to be</para>
-        <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata>
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:msub>
-                                        <mml:mi>S</mml:mi>
-                                        <mml:mi mml:fontstyle="italic">xy</mml:mi>
-                                    </mml:msub>
-                                    <mml:mrow>
-                                        <mml:mrow>
-                                            <mml:mo mml:stretchy="false">(</mml:mo>
-                                            <mml:mo mml:stretchy="false">ω</mml:mo>
-                                            <mml:mo mml:stretchy="false">)</mml:mo>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">=</mml:mo>
-                                        <mml:mfrac>
-                                            <mml:mn>1</mml:mn>
-                                            <mml:mi>N</mml:mi>
-                                        </mml:mfrac>
-                                    </mml:mrow>
-                                    <mml:mrow>
-                                        <mml:mo mml:stretchy="false">(</mml:mo>
-                                        <mml:mrow>
-                                            <mml:mrow>
-                                                <mml:munderover>
-                                                    <mml:mo mml:stretchy="false">∑</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mi>n</mml:mi>
-                                                        <mml:mo mml:stretchy="false">=</mml:mo>
-                                                        <mml:mn>0</mml:mn>
-                                                    </mml:mrow>
-                                                    <mml:mrow>
-                                                        <mml:mi>N</mml:mi>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:mn>1</mml:mn>
-                                                    </mml:mrow>
-                                                </mml:munderover>
-                                                <mml:mi>x</mml:mi>
-                                            </mml:mrow>
-                                            <mml:mrow>
-                                                <mml:mo mml:stretchy="false">(</mml:mo>
-                                                <mml:mi>n</mml:mi>
-                                                <mml:mo mml:stretchy="false">)</mml:mo>
-                                            </mml:mrow>
-                                            <mml:msup>
-                                                <mml:mi>e</mml:mi>
-                                                <mml:mrow>
-                                                    <mml:mrow>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:mi>i</mml:mi>
-                                                    </mml:mrow>
-                                                    <mml:mo mml:stretchy="false">ω</mml:mo>
-                                                    <mml:mi>n</mml:mi>
-                                                </mml:mrow>
-                                            </mml:msup>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">)</mml:mo>
-                                    </mml:mrow>
-                                    <mml:mrow>
-                                        <mml:mo mml:stretchy="false">(</mml:mo>
-                                        <mml:mrow>
-                                            <mml:mrow>
-                                                <mml:munderover>
-                                                    <mml:mo mml:stretchy="false">∑</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mi>n</mml:mi>
-                                                        <mml:mo mml:stretchy="false">=</mml:mo>
-                                                        <mml:mn>0</mml:mn>
-                                                    </mml:mrow>
-                                                    <mml:mrow>
-                                                        <mml:mi>N</mml:mi>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:mn>1</mml:mn>
-                                                    </mml:mrow>
-                                                </mml:munderover>
-                                                <mml:mover mml:accent="true">
-                                                    <mml:mi>y</mml:mi>
-                                                    <mml:mo mml:stretchy="false">ˉ</mml:mo>
-                                                </mml:mover>
-                                            </mml:mrow>
-                                            <mml:mrow>
-                                                <mml:mo mml:stretchy="false">(</mml:mo>
-                                                <mml:mi>n</mml:mi>
-                                                <mml:mo mml:stretchy="false">)</mml:mo>
-                                            </mml:mrow>
-                                            <mml:msup>
-                                                <mml:mi>e</mml:mi>
-                                                <mml:mrow>
-                                                    <mml:mi>i</mml:mi>
-                                                    <mml:mo mml:stretchy="false">ω</mml:mo>
-                                                    <mml:mi>n</mml:mi>
-                                                </mml:mrow>
-                                            </mml:msup>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">)</mml:mo>
-                                    </mml:mrow>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0"> S_{xy}(%omega)={1}
-                                    over {N} (sum from{n=0} to{N-1} x(n)e^{-i %omega n}) ( sum
-                                    from{n=0} to{N-1} bar y(n)e^{i %omega n})
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
-        </para>
-        <para>The correlation method calculates the spectral estimate as the
-            Fourier transform of a modified estimate of the auto/cross correlation
-            function. This auto/cross correlation modified estimate consist of
-            repeatedly calculating estimates of the autocorrelation function from
-            overlapping sub-segments if the data, and then averaging these estimates
-            to obtain the result.
-        </para>
-        <para>The number of points of the window is
-            <literal>2*nlags-1.</literal>
-        </para>
-        <para>
-            For batch processing, the<literal> x</literal> and
-            <literal>y</literal> data may be read segment by segment using the
-            <literal>getx </literal>and <literal>gety</literal> user defined
-            functions. These functions have the following syntax:
-        </para>
-        <para>
-            <literal>xk=getx(ns,offset)</literal> and
-            <literal>yk=gety(ns,offset)</literal> where <literal>ns</literal> is the
-            segment size and <literal>offset</literal> is the index of the first
-            element of the segment in the full signal.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Warning</title>
-        <para>For Scilab version up to 5.0.2 the returned value was the modulus of the current one.</para>
-    </refsection>
-    <refsection>
-        <title>Reference</title>
-        <para>Oppenheim, A.V., and R.W. Schafer. Discrete-Time Signal Processing,
-            Upper Saddle River, NJ: Prentice-Hall, 1999
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-rand('normal');rand('seed',0);
-x=rand(1:1024-33+1);
-//make low-pass filter with eqfir
-nf=33;bedge=[0 .1;.125 .5];des=[1 0];wate=[1 1];
-h=eqfir(nf,bedge,des,wate);
-//filter white data to obtain colored data
-h1=[h 0*ones(1:max(size(x))-1)];
-x1=[x 0*ones(1:max(size(h))-1)];
-hf=fft(h1,-1);   xf=fft(x1,-1);yf=hf.*xf;y=real(fft(yf,1));
-sm=cspect(100,200,'tr',y);
-smsize=max(size(sm));fr=(1:smsize)/smsize;
-plot(fr,log(sm))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="pspect">pspect</link>
-            </member>
-            <member>
-                <link linkend="mese">mese</link>
-            </member>
-            <member>
-                <link linkend="corr">corr</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/signal_processing/help/fr_FR/spectral_estimation/pspect.xml b/scilab/modules/signal_processing/help/fr_FR/spectral_estimation/pspect.xml
deleted file mode 100644 (file)
index dcbc35c..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="pspect" xml:lang="fr">
-    <refnamediv>
-        <refname>pspect</refname>
-        <refpurpose>two sided cross-spectral estimate between 2 discrete time signals using
-            the Welch's average periodogram method.
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            [sm [,cwp]]=pspect(sec_step,sec_leng,wtype,x [,y] [,wpar])
-            [sm [,cwp]]=pspect(sec_step,sec_leng,wtype,nx [,ny] [,wpar])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>vector, the time-domain samples of the first signal.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>y</term>
-                <listitem>
-                    <para>
-                        vector, the time-domain samples of the second signal. If <literal>y</literal>
-                        is omitted it is supposed to be equal to <literal>x</literal>
-                        (auto-correlation). If it is present, it must have the same numer of
-                        element than <literal>x</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>nx</term>
-                <listitem>
-                    <para>
-                        a scalar : the number of samples in the <literal>x</literal>
-                        signal. In this case the segments of the <literal>x</literal> signal are loaded by a
-                        user defined function named <literal>getx</literal> (see
-                        below).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ny</term>
-                <listitem>
-                    <para>a scalar : the number of samples in the
-                        <literal>y</literal> signal. In this case the segments of
-                        the y signal are loaded by a user defined function named
-                        <literal>gety</literal> (see below). If present
-                        <literal>ny</literal> must be equal to
-                        <literal>nx</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>sec_step</term>
-                <listitem>
-                    <para>
-                        offset of each data window. The overlap <literal>D
-                        </literal>
-                        is given by sec_leng -sec_step<literal>. if
-                            sec_step==sec_leng/2
-                        </literal>
-                        50% overlap is made. The
-                        overlap
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>sec_leng</term>
-                <listitem>
-                    <para>Number of points of the window.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>wtype</term>
-                <listitem>
-                    <para>The window type</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                <literal>'re'</literal>: rectangular
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'tr'</literal>: triangular
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'hm'</literal>: Hamming
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'hn'</literal>: Hann
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'kr'</literal>: Kaiser,in this case the wpar
-                                argument must be given
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                <literal>'ch'</literal>: Chebyshev, in this case the wpar
-                                argument must be given
-                            </para>
-                        </listitem>
-                    </itemizedlist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>wpar</term>
-                <listitem>
-                    <para>
-                        optional parameters for <literal>Kaiser and Chebyshev
-                            windows:
-                        </literal>
-                    </para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                'kr': <literal>wpar must be a strictly positive
-                                    number
-                                </literal>
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                'ch': <literal>wpar</literal> must be a 2 element vector
-                                <literal> [main_lobe_width,side_lobe_height]with
-                                </literal>
-                                <literal>0&lt;main_lobe_width&lt;.5</literal>, and
-                                <literal>side_lobe_height&gt;0</literal>
-                            </para>
-                        </listitem>
-                    </itemizedlist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>sm</term>
-                <listitem>
-                    <para>
-                        Two sided power spectral estimate in the interval <literal>[0,1]</literal> of the
-                        normalized frequencies. It is a row array with  <literal>sec_len</literal>
-                        elements . The array is real in case of auto-correlation and
-                        complex in case of cross-correlation.
-                    </para>
-                    <para>The associated normalized frequencies array is
-                        <literal>linspace(0,1,sec_len)</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>cwp</term>
-                <listitem>
-                    <para>unspecified Chebyshev window parameter in case of Chebyshev
-                        windowing, or an empty matrix.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>Computes the cross-spectrum estimate of two signals
-            <literal>x</literal> and <literal>y</literal> if both are given and the
-            auto-spectral estimate of <literal>x</literal> otherwise. Spectral
-            estimate obtained using the modified periodogram method.
-        </para>
-        <para>
-            The cross spectrum of two signal <literal>x</literal> and  <literal>y</literal> is defined to be
-        </para>
-        <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata>
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:msub>
-                                        <mml:mi>S</mml:mi>
-                                        <mml:mi mml:fontstyle="italic">xy</mml:mi>
-                                    </mml:msub>
-                                    <mml:mrow>
-                                        <mml:mrow>
-                                            <mml:mo mml:stretchy="false">(</mml:mo>
-                                            <mml:mo mml:stretchy="false">ω</mml:mo>
-                                            <mml:mo mml:stretchy="false">)</mml:mo>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">=</mml:mo>
-                                        <mml:mfrac>
-                                            <mml:mn>1</mml:mn>
-                                            <mml:mi>N</mml:mi>
-                                        </mml:mfrac>
-                                    </mml:mrow>
-                                    <mml:mrow>
-                                        <mml:mo mml:stretchy="false">(</mml:mo>
-                                        <mml:mrow>
-                                            <mml:mrow>
-                                                <mml:munderover>
-                                                    <mml:mo mml:stretchy="false">∑</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mi>n</mml:mi>
-                                                        <mml:mo mml:stretchy="false">=</mml:mo>
-                                                        <mml:mn>0</mml:mn>
-                                                    </mml:mrow>
-                                                    <mml:mrow>
-                                                        <mml:mi>N</mml:mi>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:mn>1</mml:mn>
-                                                    </mml:mrow>
-                                                </mml:munderover>
-                                                <mml:mi>x</mml:mi>
-                                            </mml:mrow>
-                                            <mml:mrow>
-                                                <mml:mo mml:stretchy="false">(</mml:mo>
-                                                <mml:mi>n</mml:mi>
-                                                <mml:mo mml:stretchy="false">)</mml:mo>
-                                            </mml:mrow>
-                                            <mml:msup>
-                                                <mml:mi>e</mml:mi>
-                                                <mml:mrow>
-                                                    <mml:mrow>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:mi>i</mml:mi>
-                                                    </mml:mrow>
-                                                    <mml:mo mml:stretchy="false">ω</mml:mo>
-                                                    <mml:mi>n</mml:mi>
-                                                </mml:mrow>
-                                            </mml:msup>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">)</mml:mo>
-                                    </mml:mrow>
-                                    <mml:mrow>
-                                        <mml:mo mml:stretchy="false">(</mml:mo>
-                                        <mml:mrow>
-                                            <mml:mrow>
-                                                <mml:munderover>
-                                                    <mml:mo mml:stretchy="false">∑</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mi>n</mml:mi>
-                                                        <mml:mo mml:stretchy="false">=</mml:mo>
-                                                        <mml:mn>0</mml:mn>
-                                                    </mml:mrow>
-                                                    <mml:mrow>
-                                                        <mml:mi>N</mml:mi>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:mn>1</mml:mn>
-                                                    </mml:mrow>
-                                                </mml:munderover>
-                                                <mml:mover mml:accent="true">
-                                                    <mml:mi>y</mml:mi>
-                                                    <mml:mo mml:stretchy="false">ˉ</mml:mo>
-                                                </mml:mover>
-                                            </mml:mrow>
-                                            <mml:mrow>
-                                                <mml:mo mml:stretchy="false">(</mml:mo>
-                                                <mml:mi>n</mml:mi>
-                                                <mml:mo mml:stretchy="false">)</mml:mo>
-                                            </mml:mrow>
-                                            <mml:msup>
-                                                <mml:mi>e</mml:mi>
-                                                <mml:mrow>
-                                                    <mml:mi>i</mml:mi>
-                                                    <mml:mo mml:stretchy="false">ω</mml:mo>
-                                                    <mml:mi>n</mml:mi>
-                                                </mml:mrow>
-                                            </mml:msup>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">)</mml:mo>
-                                    </mml:mrow>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0"> S_{xy}(%omega)={1}
-                                    over {N} (sum from{n=0} to{N-1} x(n)e^{-i %omega n}) ( sum
-                                    from{n=0} to{N-1} bar y(n)e^{i %omega n})
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
-        </para>
-        <para>The modified periodogram method of spectral estimation repeatedly
-            calculates the periodogram of windowed sub-sections of the data contained
-            in <literal>x</literal> and <literal>y</literal> . These periodograms are
-            then averaged together and normalized by an appropriate constant to obtain
-            the final spectral estimate. It is the averaging process which reduces the
-            variance in the estimate.
-        </para>
-        <para>
-            For batch processing, the <literal>x</literal> and
-            <literal>y</literal> data may be read segment by segment using the
-            <literal>getx </literal>and <literal>gety</literal> user defined
-            functions. These functions have the following syntax:
-        </para>
-        <para>
-            <literal>xk=getx(ns,offset)</literal> and
-            <literal>yk=gety(ns,offset)</literal> where <literal>ns</literal> is the
-            segment size and <literal>offset</literal> is the index of the first
-            element of the segment in the full signal.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Reference</title>
-        <para>Oppenheim, A.V., and R.W. Schafer. Discrete-Time Signal Processing,
-            Upper Saddle River, NJ: Prentice-Hall, 1999
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-rand('normal');rand('seed',0);
-x=rand(1:1024-33+1);
-
-//make low-pass filter with eqfir
-nf=33;bedge=[0 .1;.125 .5];des=[1 0];wate=[1 1];
-h=eqfir(nf,bedge,des,wate);
-
-//filter white data to obtain colored data
-h1=[h 0*ones(1:max(size(x))-1)];
-x1=[x 0*ones(1:max(size(h))-1)];
-hf=fft(h1,-1); xf=fft(x1,-1);y=real(fft(hf.*xf,1));
-
-//plot magnitude of filter
-h2=[h 0*ones(1:968)];hf2=fft(h2,-1);hf2=real(hf2.*conj(hf2));
-hsize=max(size(hf2));fr=(1:hsize)/hsize;plot(fr,log(hf2));
-
-//pspect example
-sm=pspect(100,200,'tr',y);smsize=max(size(sm));fr=(1:smsize)/smsize;
-plot(fr,log(sm));
-rand('unif');
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="cspect">cspect</link>
-            </member>
-            <member>
-                <link linkend="pspect">pspect</link>
-            </member>
-            <member>
-                <link linkend="mese">mese</link>
-            </member>
-            <member>
-                <link linkend="window">window</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 147b730..7718202 100644 (file)
@@ -55,7 +55,7 @@
             </mediaobject>
         </informalequation>
         <para>
-            For small <literal>x</literal> and <literal>y</literal> (<literal>x+y&#8804;2</literal> elementwise),
+            For small <literal>x</literal> and <literal>y</literal> (<literal>x+y ≤ 2</literal> elementwise),
             the algorithm uses the expression in function of the gamma function, else it
             applies the exponential function onto the result of the
             <literal>betaln</literal> function provided with the DCDFLIB: Library of