[doc] Misc. small improvements 23/21423/21
Samuel GOUGEON [Fri, 28 Feb 2020 04:51:15 +0000 (05:51 +0100)]
  * backslash: short desc improved. See also: + datafit.
  * preferences: See also: + xmlSetValues
  * csc, cscd (ru): LaTeX removed (as for all other LANG)
  * eig: useless LaTeX removed
  * prettyprint_mathJax: image reduced to 75%
  * bode: image #2 needed regen
  * axes_properties: typo, http://bugzilla.scilab.org/16379
  * cspect, pspect, convol, delip: MathML replaced with (compact!) LaTeX
  * int2d: See also: + mesh2d
  * scilab_primitives: add refs to webtools functions, mesh2d
  * MUX, DEMUX: wrong max # of ports fixed (8 => 31)

Change-Id: I50f53382558c78b0e1531006304a213773b39c62

64 files changed:
scilab/modules/core/help/en_US/1_keywords/backslash.xml
scilab/modules/core/help/fr_FR/1_keywords/backslash.xml
scilab/modules/core/help/ja_JP/1_keywords/backslash.xml
scilab/modules/core/help/pt_BR/1_keywords/backslash.xml
scilab/modules/core/help/ru_RU/1_keywords/backslash.xml
scilab/modules/differential_equations/help/en_US/int2d.xml
scilab/modules/differential_equations/help/ja_JP/int2d.xml
scilab/modules/differential_equations/help/pt_BR/int2d.xml
scilab/modules/differential_equations/help/ru_RU/int2d.xml
scilab/modules/elementary_functions/help/en_US/trigonometry/csc.xml
scilab/modules/elementary_functions/help/en_US/trigonometry/cscd.xml
scilab/modules/elementary_functions/help/ru_RU/trigonometry/csc.xml
scilab/modules/elementary_functions/help/ru_RU/trigonometry/cscd.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/ja_JP/axes_operations/axes_properties.xml
scilab/modules/graphics/help/pt_BR/axes_operations/axes_properties.xml
scilab/modules/helptools/data/configuration/scilab_primitives.txt
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/_LaTeX_convol.xml_1.png [new file with mode: 0644]
scilab/modules/helptools/images/_LaTeX_csc.xml_1.png [deleted file]
scilab/modules/helptools/images/_LaTeX_csc.xml_2.png [deleted file]
scilab/modules/helptools/images/_LaTeX_cscd.xml_1.png [deleted file]
scilab/modules/helptools/images/_LaTeX_cscd.xml_2.png [deleted file]
scilab/modules/helptools/images/_LaTeX_cspect.xml_1.png [new file with mode: 0644]
scilab/modules/helptools/images/_LaTeX_delip.xml_1.png [new file with mode: 0644]
scilab/modules/helptools/images/_LaTeX_eig.xml_1.png [deleted file]
scilab/modules/helptools/images/_LaTeX_pspect.xml_1.png [new file with mode: 0644]
scilab/modules/helptools/images/_MathML_convol.xml_1.png [deleted file]
scilab/modules/helptools/images/_MathML_cspect.xml_1.png [deleted file]
scilab/modules/helptools/images/_MathML_delip.xml_1.png [deleted file]
scilab/modules/helptools/images/_MathML_pspect.xml_1.png [deleted file]
scilab/modules/helptools/images/bode_en_US_2.png
scilab/modules/helptools/images/bode_fr_FR_2.png
scilab/modules/helptools/images/bode_ja_JP_2.png
scilab/modules/helptools/images/bode_pt_BR_2.png
scilab/modules/helptools/images/bode_ru_RU_2.png
scilab/modules/helptools/images/datafit_A.png [new file with mode: 0644]
scilab/modules/helptools/images/datafit_B.png [new file with mode: 0644]
scilab/modules/helptools/images/datafit_C.png [new file with mode: 0644]
scilab/modules/helptools/images/prettyprint_LaTeX_MathJax.png
scilab/modules/m2sci/help/en_US/m2sci_equivalents/e/eig.xml
scilab/modules/optimization/help/en_US/nonlinearleastsquares/datafit.xml
scilab/modules/preferences/help/en_US/preferences.xml
scilab/modules/preferences/help/fr_FR/preferences.xml
scilab/modules/preferences/help/ja_JP/preferences.xml
scilab/modules/preferences/help/ru_RU/preferences.xml
scilab/modules/signal_processing/help/en_US/correlation_convolution/convol.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/ja_JP/correlation_convolution/convol.xml
scilab/modules/signal_processing/help/ja_JP/spectral_estimation/cspect.xml
scilab/modules/signal_processing/help/ja_JP/spectral_estimation/pspect.xml
scilab/modules/signal_processing/help/ru_RU/correlation_convolution/convol.xml [new file with mode: 0644]
scilab/modules/signal_processing/help/ru_RU/spectral_estimation/cspect.xml [new file with mode: 0644]
scilab/modules/signal_processing/help/ru_RU/spectral_estimation/pspect.xml [new file with mode: 0644]
scilab/modules/special_functions/help/en_US/bessel.xml
scilab/modules/special_functions/help/en_US/delip.xml
scilab/modules/special_functions/help/fr_FR/delip.xml
scilab/modules/special_functions/help/ja_JP/delip.xml
scilab/modules/special_functions/help/pt_BR/delip.xml
scilab/modules/special_functions/help/ru_RU/delip.xml
scilab/modules/string/help/images/prettyprint_LaTeX_MathJax.png
scilab/modules/xcos/help/en_US/palettes/Signalrouting_pal/DEMUX.xml
scilab/modules/xcos/help/en_US/palettes/Signalrouting_pal/MUX.xml

index e7a9d66..c9505f7 100644 (file)
@@ -5,7 +5,7 @@
           xml:lang="en" xml:id="backslash">
     <refnamediv>
         <refname>backslash</refname>
-        <refpurpose>(\) left matrix division.</refpurpose>
+        <refpurpose>(\) left matrix division: Exact or least square solution</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
@@ -131,6 +131,9 @@ mprintf('\ntime with backslash: %.3f\n',toc());
                 <link linkend="umfpack">umfpack</link>
             </member>
             <member>
+                <link linkend="datafit">datafit</link>
+            </member>
+            <member>
                 <link linkend="krondivide">kron .\.</link>
             </member>
             <member>
index 0676968..fa90d04 100644 (file)
@@ -5,7 +5,7 @@
           xml:lang="fr" xml:id="backslash">
     <refnamediv>
         <refname>backslash</refname>
-        <refpurpose>(\) division matricielle à gauche</refpurpose>
+        <refpurpose>(\) division matricielle à gauche : solution exacte ou selon moindres carrés</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
@@ -79,6 +79,9 @@ mprintf('\ntemps nécessaire à la résolution du système avec l''opérateur ba
                 <link linkend="umfpack">umfpack</link>
             </member>
             <member>
+                <link linkend="datafit">datafit</link>
+            </member>
+            <member>
                 <link linkend="krondivide">kron .\.</link>
             </member>
             <member>
index 944ef0b..8625c6d 100644 (file)
@@ -5,7 +5,7 @@
           xml:lang="ja" xml:id="backslash">
     <refnamediv>
         <refname>backslash</refname>
-        <refpurpose>(\) 左行列除算.</refpurpose>
+        <refpurpose>(\) 左行列除算: exact or least square solution</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
@@ -134,6 +134,9 @@ mprintf('\ntime with backslash: %.3f\n',toc());
                 <link linkend="umfpack">umfpack</link>
             </member>
             <member>
+                <link linkend="datafit">datafit</link>
+            </member>
+            <member>
                 <link linkend="krondivide">kron .\.</link>
             </member>
             <member>
index c72d5ce..ae8f851 100644 (file)
@@ -5,7 +5,7 @@
           xmlns:scilab="http://www.scilab.org" xml:id="backslash" xml:lang="pt">
     <refnamediv>
         <refname>backslash</refname>
-        <refpurpose>(\) divisão matricial direita-esquerda</refpurpose>
+        <refpurpose>(\) divisão matricial direita-esquerda: exact or least square solution</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
@@ -91,6 +91,9 @@ mprintf('\ntime needed to solve the system with the backslash operator: %.3f\n',
                 <link linkend="umfpack">umfpack</link>
             </member>
             <member>
+                <link linkend="datafit">datafit</link>
+            </member>
+            <member>
                 <link linkend="krondivide">kron .\.</link>
             </member>
             <member>
index 5e24f7e..eff761b 100644 (file)
@@ -5,7 +5,7 @@
           xml:lang="ru" xml:id="backslash">
     <refnamediv>
         <refname>обратный слэш (\)</refname>
-        <refpurpose>(\) левое матричное деление.</refpurpose>
+        <refpurpose>(\) левое матричное деление: точное решение или решение по методу наименьших квадратов</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
@@ -19,7 +19,8 @@
         </para>
         <para>
             Если <literal>A</literal> - квадратная и невырожденная, то  <code>X=A\B</code>
-            (уникально определённая) эквивалентно <code>X=inv(A)*B</code> в точном арифметическом смысле, однако вычисления гораздо точнее и дешевле в арифметике с плавающей запятой.
+            (уникально определённая) эквивалентно <code>X=inv(A)*B</code> в точном арифметическом смысле,
+            однако вычисления гораздо точнее и дешевле в арифметике с плавающей запятой.
             Следовательно, чтобы вычислить решение линейной системы уравнений <code>A*X=B</code>,
             следует использовать оператор "обратный слэш", а функцию  <function>inv</function> не следует использовать.
         </para>
@@ -56,7 +57,8 @@
         </para>
         <para>
             <literal>A\.B</literal> является оператором без предопределённого значения. Он может использоваться
-            для определения нового оператора (см. <link linkend="overloading">перегрузку</link>) с тем же самым приоритетом что и <literal>*</literal> или <literal>/</literal>.
+            для определения нового оператора (см. <link linkend="overloading">перегрузку</link>) с тем же самым приоритетом
+            что и <literal>*</literal> или <literal>/</literal>.
         </para>
     </refsection>
     <refsection>
@@ -135,10 +137,13 @@ mprintf('\nвремя, необходимое для решения систем
                 <link linkend="umfpack">umfpack</link>
             </member>
             <member>
+                <link linkend="datafit">datafit</link>
+            </member>
+            <member>
                 <link linkend="krondivide">kron .\.</link>
             </member>
             <member>
-                <link linkend="overloading">overloading</link>
+                <link linkend="overloading">перегрузка</link>
             </member>
         </simplelist>
     </refsection>
index d937851..7cf44de 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="int2d" 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="int2d" xml:lang="en">
     <refnamediv>
         <refname>int2d</refname>
         <refpurpose>definite 2D integral by quadrature and cubature
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[I,err]=int2d(X,Y,f [,params])</synopsis>
+        <synopsis>
+            [I, err] = int2d(X, Y, f)
+            [I, err] = int2d(X, Y, f, params)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-X=[0,0;1,1;1,0];
-Y=[0,0;0,1;1,1];
+X = [0,0;1,1;1,0];
+Y = [0,0;0,1;1,1];
 deff('z=f(x,y)','z=cos(x+y)')
-[I,e]=int2d(X,Y,f)
+[I,e] = int2d(X,Y,f)
 // computes the integrand over the square [0 1]x[0 1]
  ]]></programlisting>
     </refsection>
@@ -175,10 +181,7 @@ deff('z=f(x,y)','z=cos(x+y)')
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="intc">intc</link>
-            </member>
-            <member>
-                <link linkend="intl">intl</link>
+                <link linkend="mesh2d">mesh2d</link>
             </member>
             <member>
                 <link linkend="int3d">int3d</link>
@@ -187,7 +190,10 @@ deff('z=f(x,y)','z=cos(x+y)')
                 <link linkend="intg">intg</link>
             </member>
             <member>
-                <link linkend="mesh">mesh</link>
+                <link linkend="intl">intl</link>
+            </member>
+            <member>
+                <link linkend="intc">intc</link>
             </member>
         </simplelist>
     </refsection>
index fd12490..7a1e8b7 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="int2d" 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="int2d" xml:lang="ja">
     <refnamediv>
 
         <refname>int2d</refname>
 
         <title>呼び出し手順</title>
 
-        <synopsis>[I,err]=int2d(X,Y,f [,params])</synopsis>
+        <synopsis>
+            [I, err] = int2d(X, Y, f)
+            [I, err] = int2d(X, Y, f, params)
+        </synopsis>
 
     </refsynopsisdiv>
 
         <title>例</title>
 
         <programlisting role="example"><![CDATA[
-X=[0,0;1,1;1,0];
-Y=[0,0;0,1;1,1];
+X = [0,0;1,1;1,0];
+Y = [0,0;0,1;1,1];
 deff('z=f(x,y)','z=cos(x+y)')
-[I,e]=int2d(X,Y,f)
+[I,e] = int2d(X, Y, f)
 // 正方形の区間 [0 1]x[0 1] で被積分関数を計算します
  ]]></programlisting>
 
@@ -341,37 +346,21 @@ deff('z=f(x,y)','z=cos(x+y)')
         <title>参照</title>
 
         <simplelist type="inline">
-
             <member>
-
-                <link linkend="intc">intc</link>
-
+                <link linkend="mesh2d">mesh2d</link>
             </member>
-
             <member>
-
-                <link linkend="intl">intl</link>
-
-            </member>
-
-            <member>
-
                 <link linkend="int3d">int3d</link>
-
             </member>
-
             <member>
-
                 <link linkend="intg">intg</link>
-
             </member>
-
             <member>
-
-                <link linkend="mesh">mesh</link>
-
+                <link linkend="intl">intl</link>
+            </member>
+            <member>
+                <link linkend="intc">intc</link>
             </member>
-
         </simplelist>
 
     </refsection>
index 05a8632..7576353 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="int2d" 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="int2d" xml:lang="pt">
     <refnamediv>
         <refname>int2d</refname>
         <refpurpose>integral definida 2d por quadratura e cubatura</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>[I,err]=int2d(X,Y,f [,params])</synopsis>
+        <synopsis>
+            [I, err] = int2d(X, Y, f)
+            [I, err] = int2d(X, Y, f, params)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-X=[0,0;1,1;1,0];
-Y=[0,0;0,1;1,1];
+X = [0,0;1,1;1,0];
+Y = [0,0;0,1;1,1];
 deff('z=f(x,y)','z=cos(x+y)')
-[I,e]=int2d(X,Y,f)
+[I,e] = int2d(X, Y, f)
 // computa o integrando sobre o quadrado [0 1]x[0 1]
  ]]></programlisting>
     </refsection>
@@ -172,10 +178,7 @@ deff('z=f(x,y)','z=cos(x+y)')
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="intc">intc</link>
-            </member>
-            <member>
-                <link linkend="intl">intl</link>
+                <link linkend="mesh2d">mesh2d</link>
             </member>
             <member>
                 <link linkend="int3d">int3d</link>
@@ -184,7 +187,10 @@ deff('z=f(x,y)','z=cos(x+y)')
                 <link linkend="intg">intg</link>
             </member>
             <member>
-                <link linkend="mesh">mesh</link>
+                <link linkend="intl">intl</link>
+            </member>
+            <member>
+                <link linkend="intc">intc</link>
             </member>
         </simplelist>
     </refsection>
index 498c3c6..15afdb1 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="int2d" xml:lang="ru">
+<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="int2d" xml:lang="ru">
     <refnamediv>
         <refname>int2d</refname>
         <refpurpose>определённый двумерный интеграл методом квадратуры и кубатуры</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>[I,err]=int2d(X,Y,f [,params])</synopsis>
+        <synopsis>
+            [I, err] = int2d(X, Y, f)
+            [I, err] = int2d(X, Y, f, params)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-X=[0,0;1,1;1,0];
-Y=[0,0;0,1;1,1];
+X = [0,0;1,1;1,0];
+Y = [0,0;0,1;1,1];
 deff('z=f(x,y)','z=cos(x+y)')
-[I,e]=int2d(X,Y,f)
+[I,e] = int2d(X, Y, f)
 // вычисляет подынтегральное выражение по площади [0 1]x[0 1]
  ]]></programlisting>
     </refsection>
@@ -166,10 +172,7 @@ deff('z=f(x,y)','z=cos(x+y)')
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="intc">intc</link>
-            </member>
-            <member>
-                <link linkend="intl">intl</link>
+                <link linkend="mesh2d">mesh2d</link>
             </member>
             <member>
                 <link linkend="int3d">int3d</link>
@@ -178,7 +181,10 @@ deff('z=f(x,y)','z=cos(x+y)')
                 <link linkend="intg">intg</link>
             </member>
             <member>
-                <link linkend="mesh">mesh</link>
+                <link linkend="intl">intl</link>
+            </member>
+            <member>
+                <link linkend="intc">intc</link>
             </member>
         </simplelist>
     </refsection>
index 4f55485..b23597e 100644 (file)
@@ -50,7 +50,7 @@
         <title>Description</title>
         <para>Computes the element-wise cosecant of the argument. The cosecant is
             a periodic function defined as <literal>1/sin(x)</literal>.
-            For real data the results are real and in <literal>]-∞ -1] ∪ [1 ∞[</literal>.
+            For real data the results are real and in <literal>]-∞,-1] ∪ [1,∞[</literal>.
         </para>
     </refsection>
     <refsection>
index 0a4c89b..2cf05b7 100644 (file)
@@ -49,7 +49,7 @@
         <para>
             The entries of <varname>y</varname> are the cosecant
             <literal>1/sin(x)</literal> of the entries of <varname>x</varname> given in
-            degree. The results are real and in <literal>]-∞ -1] ∪ [1 ∞[</literal>.
+            degree. The results are real and in <literal>]-∞,-1] ∪ [1,∞[</literal>.
             For entries equal to <literal>n*180</literal> with
             <literal>n</literal> integer, the result is infinite (or an error
             depending on <link linkend="ieee">ieee</link> mode). For entries equal to
index 4cb381f..2b62717 100644 (file)
@@ -47,8 +47,9 @@
         <title>Описание</title>
         <para>
             Поэлементно вычисляет косеканс аргумента. Косеканс - это периодическая
-            функция, определяемая как <latex>1/\sin(x)</latex>. Для вещественных данных результаты вещественны и
-            лежат на интервале <latex>]-\infty -1] \cup [1 \infty[</latex>.
+            функция, определяемая как <literal>1/sin(x)</literal>.
+            Для вещественных данных результаты вещественны и
+            лежат на интервале <literal>]-∞,-1] ∪ [1,∞[</literal>.
         </para>
     </refsection>
     <refsection>
index 048e984..44040a8 100644 (file)
     <refsection>
         <title>Описание</title>
         <para>
-            Элементы  <varname>y</varname> являются косекансом <latex>1/\sin(x)</latex> соответствующих
+            Элементы  <varname>y</varname> являются косекансом <literal>1/sin(x)</literal>
+            соответствующих
             элементов <varname>x</varname>, заданных в градусах. Результаты вещественные и на интервале
-            <latex>]-\infty -1] \cup [1 \infty[</latex>. Для элементов, равных <literal>n*180</literal>, где
+            <literal>]-∞,-1] ∪ [1,∞[</literal>. Для элементов, равных <literal>n*180</literal>, где
             <literal>n</literal> - целое число, результат равен бесконечности (или ошибка, в зависимости от
             режима <link linkend="ieee">ieee</link>). Для элементов, равных
             <literal>n*90</literal>, где <literal>n</literal> - целое нечётное число, результат равен строго
index c1b2d2b..9e1862b 100644 (file)
                             <term>auto_clear: </term>
                             <listitem>
                                 <para>
-                                    If this property value is equal to <literal>"on"</literal>, a call
-                                    to a high level graphic will re-initialize the current axes and
-                                    erase all its children before preforming the drawing (log_flags will be reset).
-                                    If the value is <literal>"off"</literal> the drawings will be added to current axes
-                                    according to <literal>"auto_scale"</literal> property.
+                                    <literal>"on"</literal>: a call to a high level graphic function
+                                    targeting the axes
+                                    <itemizedlist>
+                                        <listitem>
+                                            erases all children of the axes,
+                                        </listitem>
+                                        <listitem>
+                                            resets its <literal>.log_flags</literal> and
+                                            <literal>.data_bounds</literal> properties to their default value
+                                        </listitem>
+                                        <listitem>
+                                            keeps its other properties
+                                        </listitem>
+                                    </itemizedlist>
+                                    before performing the drawing.
+                                </para>
+                                <para>
+                                    <literal>"off"</literal>: the forthcoming drawings are overplotted
+                                    in the axes according to the <literal>"auto_scale"</literal> rule
+                                    and other properties.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>auto_scale: </term>
                             <listitem>
                                 <para>
-                                    A property to update the axes data boundary. If value is
-                                    <literal>"on"</literal>, a new plot will adapt the current axes
-                                    properties to fit with previous and current plots. If its value is
-                                    <literal>"off"</literal> the new plot will be drawn in the current axes
-                                    data boundary.
+                                    Property enabling the auto update of <literal>.data_bounds</literal>.
+                                    <literal>"on"</literal>: Each new plot enlarges
+                                    <literal>.data_bounds</literal> values according to boundaries
+                                    of added data.
+                                    <literal>"off"</literal>: Default or explicitly initialized values
+                                    of <literal>.data_bounds</literal> are not modified.
                                 </para>
                             </listitem>
                         </varlistentry>
index b29b220..c37e225 100644 (file)
                             <term>auto_clear: </term>
                             <listitem>
                                 <para>
-                                    このプロパティが<literal>"on"</literal>に等しい場合,
-                                    高レベルグラフィクをコールする際に
-                                    カレントの軸は再初期化され,描画前に全ての子が消去されます.
-                                    この値が<literal>"off"</literal>の場合,
-                                    描画内容が<literal>"auto_scale"</literal>プロパティに基づき
-                                    カレントの軸に追加されます.
+                                    <literal>"on"</literal>: calling any high level graphic function
+                                    targeting the axes
+                                    <itemizedlist>
+                                        <listitem>
+                                            erases all children of the axes,
+                                        </listitem>
+                                        <listitem>
+                                            resets its <literal>.log_flags</literal> and
+                                            <literal>.data_bounds</literal> properties to their default value
+                                        </listitem>
+                                        <listitem>
+                                            keeps its other properties
+                                        </listitem>
+                                    </itemizedlist>
+                                    before performing the drawing.
+                                </para>
+                                <para>
+                                    <literal>"off"</literal>: the forthcoming drawings are overplotted
+                                    in the axes according to the <literal>"auto_scale"</literal> rule
+                                    and other properties.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>auto_scale: </term>
                             <listitem>
                                 <para>
-                                    軸データ境界を更新するためのプロパティ.
-                                    この値が <literal>"on"</literal>の場合,
-                                    プロットを新規に行うとカレントの軸プロパティは
-                                    以前とカレントのプロットに適合するよう調整されます.
-                                    この値が <literal>"off"</literal>の場合,
-                                    新規のプロットはカレントの軸データ境界内に描画されます.
+                                    Property enabling the auto update of <literal>.data_bounds</literal>.
+                                    <literal>"on"</literal>: Each new plot enlarges
+                                    <literal>.data_bounds</literal> values according to boundaries
+                                    of added data, if required.
+                                    <literal>"off"</literal>: Default or explicitly
+                                    initialized values of <literal>.data_bounds</literal> are not modified.
                                 </para>
                             </listitem>
                         </varlistentry>
@@ -1180,7 +1194,7 @@ a.ticks_st=[1 1;0 m(2)];
         </para>
         <programlisting role="example" id="axes_properties_vertical_xticks"><![CDATA[
 rain_Nice  = [51  45  39 69 45 34 12 18 73 133 104 93 ];
-months = _(["January" "Febuary" "March" "April" "May" "June" "July" ..
+months = _(["January" "February" "March" "April" "May" "June" "July" ..
             "August" "September" "October" "November" "December"]);
 clf
 bar(rain_Nice,1,"cyan");
@@ -1191,7 +1205,7 @@ set(gca(), "tight_limits", "on", "font_size", 2);
 ]]></programlisting>
     <scilab:image localized="true">
 rain_Nice  = [51  45  39 69 45 34 12 18 73 133 104 93 ];
-months = _(["January" "Febuary" "March" "April" "May" "June" "July" ..
+months = _(["January" "February" "March" "April" "May" "June" "July" ..
             "August" "September" "October" "November" "December"]);
 clf
 bar(rain_Nice, 1, "cyan")
index 56e739f..fbf1c37 100644 (file)
                             <term>auto_clear:</term>
                             <listitem>
                                 <para>
-                                    se esta propriedade for <literal>"on"</literal>, uma
-                                    chamada a um gráfico de alto-nível reinicializa os eixos
-                                    correntes e apaga todos os seus galhos antes de realizar o
-                                    esboço. Se for <literal>"off"</literal> os esboços serão
-                                    adicionados aos eixos correntes de acordo com a propriedade
-                                    <literal>"auto_scale"</literal>.
+                                    <literal>"on"</literal>: calling any high level graphic function
+                                    targeting the axes
+                                    <itemizedlist>
+                                        <listitem>
+                                            erases all children of the axes,
+                                        </listitem>
+                                        <listitem>
+                                            resets its <literal>.log_flags</literal> and
+                                            <literal>.data_bounds</literal> properties to their default value
+                                        </listitem>
+                                        <listitem>
+                                            keeps its other properties
+                                        </listitem>
+                                    </itemizedlist>
+                                    before performing the drawing.
+                                </para>
+                                <para>
+                                    <literal>"off"</literal>: the forthcoming drawings are overplotted
+                                    in the axes according to the <literal>"auto_scale"</literal> rule
+                                    and other properties.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>auto_scale:</term>
                             <listitem>
-                                <para>uma propriedade para atualizar os limites de dados dos
-                                    eixos. Se o valor for <literal>"on"</literal>, um novo esboço
-                                    adaptará as propriedades de eixos correntes para se adequar
-                                    aos esboços anteriores e correntes. Se o valor for
-                                    <literal>"off"</literal> o novo esboço será esboçado nos
-                                    limites de dados correntes.
+                                <para>
+                                    Property enabling the auto update of <literal>.data_bounds</literal>.
+                                    <literal>"on"</literal>: Each new plot enlarges
+                                    <literal>.data_bounds</literal> values according to boundaries
+                                    of added data, if required.
+                                    <literal>"off"</literal>: Default or explicitly
+                                    initialized values of <literal>.data_bounds</literal> are not modified.
                                 </para>
                             </listitem>
                         </varlistentry>
@@ -1079,7 +1094,7 @@ sda() // de volta aos eixos modelos padrões
         </para>
         <programlisting role="example" id="axes_properties_vertical_xticks"><![CDATA[
 rain_Nice  = [51  45  39 69 45 34 12 18 73 133 104 93 ];
-months = _(["January" "Febuary" "March" "April" "May" "June" "July" ..
+months = _(["January" "February" "March" "April" "May" "June" "July" ..
             "August" "September" "October" "November" "December"]);
 clf
 bar(rain_Nice,1,"cyan");
@@ -1090,7 +1105,7 @@ set(gca(), "tight_limits", "on", "font_size", 2);
 ]]></programlisting>
     <scilab:image localized="true">
 rain_Nice  = [51  45  39 69 45 34 12 18 73 133 104 93 ];
-months = _(["January" "Febuary" "March" "April" "May" "June" "July" ..
+months = _(["January" "February" "March" "April" "May" "June" "July" ..
             "August" "September" "October" "November" "December"]);
 clf
 bar(rain_Nice, 1, "cyan")
index 7a72530..e791793 100644 (file)
@@ -658,6 +658,7 @@ mclearerr
 mclose
 meof
 merror
+mesh2d
 messagebox
 mfscanf
 mget
@@ -1003,6 +1004,7 @@ dos
 filter
 findfileassociation
 fprintfMat
+fromJSON
 getio
 getpid
 getsystemmetrics
@@ -1015,6 +1017,12 @@ htmlDump
 htmlRead
 htmlReadStr
 htmlWrite
+http_delete
+http_get
+http_patch
+http_post
+http_put
+http_upload
 istssession
 jcompile
 mcisendstring
@@ -1037,6 +1045,7 @@ slint
 spcompack
 sprintf
 toprint
+toJSON
 what
 who
 win64
index a828566..b99aa68 100644 (file)
@@ -259,13 +259,11 @@ _LaTeX_bvode.xml_4.png=67ea98c8b54fcf94a210fcd90e114aa5
 _LaTeX_cdfgam.xml_1.png=0fde32f1e0edeb1f6426f9add9e8640a
 _LaTeX_cdfnor.xml_1.png=b86b06522195bfcbfd8f4536dfa11330
 _LaTeX_ceil.xml_ru_RU_1.png=701fa44621fd283e3f2c5468958859d8
+_LaTeX_convol.xml_1.png=82bb4f128f0caee1a779c28ac0fa4df6
 _LaTeX_corr.xml_1.png=51c8f81c08ebb3f4e16d3c478bba98ae
 _LaTeX_cov.xml_1.png=1c3e8061d5b85a1b05a8f1c390f6f94d
 _LaTeX_cross.xml_1.png=9653e9a5372afaed5d4a1ca1554ecac7
-_LaTeX_csc.xml_1.png=95c11e401eed01b86b588b99436708ae
-_LaTeX_csc.xml_2.png=0e070fd531e084fbf4de11e4096f5d58
-_LaTeX_cscd.xml_1.png=95c11e401eed01b86b588b99436708ae
-_LaTeX_cscd.xml_2.png=0e070fd531e084fbf4de11e4096f5d58
+_LaTeX_cspect.xml_1.png=b0ddf127f0efe569040b1b969b9eb30b
 _LaTeX_cumprod.xml_1.png=4a71bf575ae183b006d4b3ff57b97cc4
 _LaTeX_cumprod.xml_2.png=dce716c26ba9ee77970d59e48cbec6ea
 _LaTeX_cumprod.xml_3.png=dac1eef2ec85e26d497e63441494fb62
@@ -286,6 +284,7 @@ _LaTeX_dct.xml_5.png=3a9347912eb63f0db13e7755e6222774
 _LaTeX_dct.xml_6.png=c0e3f553bdf2b00785d85a88c070d7ac
 _LaTeX_dct.xml_7.png=c1281c78101880b1bfd5f00d8fe3f654
 _LaTeX_dct.xml_8.png=f28152d5910cdadab309239834b072b3
+_LaTeX_delip.xml_1.png=37cb84bfae9d9238643106ec09d43388
 _LaTeX_derivat.xml_1.png=884753c7c6265a65bb3803b66a0fec59
 _LaTeX_derivat.xml_2.png=1f26913a320e0f43588894e762729d16
 _LaTeX_dst.xml_1.png=9cd22909f8eca591c252c206124e482f
@@ -294,7 +293,6 @@ _LaTeX_dst.xml_3.png=caa2ed7797bbc39b3a28cb86ce6ce771
 _LaTeX_dst.xml_4.png=e0b5525d8028e14e0b966cc618e3891f
 _LaTeX_dst.xml_5.png=487b751549c27e45c6f346757a948f45
 _LaTeX_dst.xml_6.png=1c1c3e34d789b6c231379d588dbf6228
-_LaTeX_eig.xml_1.png=2547e4ad6c49d3508def1b1e6cdc420c
 _LaTeX_ellipj.xml_1.png=6805bd44fc35b6ba47fb42e2e276e671
 _LaTeX_erf.xml_1.png=e64af8badd1634f233888753939db01d
 _LaTeX_erfc.xml_1.png=be98f7db5bd298ff2c38bce2e7bb90dd
@@ -412,6 +410,7 @@ _LaTeX_prod.xml_2.png=36e17bceced31cceba9ae0745b814988
 _LaTeX_prod.xml_3.png=cd9dd14f63c05c574d2b9d7af5f12b38
 _LaTeX_prod.xml_4.png=328f426a2ba5a5c8addff7ed0856f865
 _LaTeX_prod.xml_5.png=57033343009b691a8288617953c2dd43
+_LaTeX_pspect.xml_1.png=b0ddf127f0efe569040b1b969b9eb30b
 _LaTeX_sec.xml_1.png=d2e78d675321c767e8087462a85491e2
 _LaTeX_sec.xml_2.png=0e070fd531e084fbf4de11e4096f5d58
 _LaTeX_sec.xml_3.png=4d00d79b6733c9cc066584a02ed03410
@@ -453,10 +452,6 @@ _MathML_bvode.xml_9.png=3b57ed40251a3a9a66f84e960d45b517
 _MathML_bvode.xml_ru_RU_10.png=feaee80fc677920029dac0d5b539507a
 _MathML_bvode.xml_ru_RU_17.png=1f47e9a3a469e6f8e4fee9cefe7ccc38
 _MathML_bvode.xml_ru_RU_7.png=bf99445553185140244e57466f859bd5
-_MathML_convol.xml_1.png=99ca156723e23394e879c2035745d736
-_MathML_cspect.xml_1.png=1219d0564561afe97ea367612399e26a
-_MathML_delip.xml_1.png=69d9a5b9453c4b10349d9c25e33f0a64
-_MathML_pspect.xml_1.png=1219d0564561afe97ea367612399e26a
 acos_1.png=17d595e24e7d60478a837a3b8abe0798
 acosd_1.png=a933487424afe251b71aaf38fb285f1c
 acosh_1.png=a4c877a5afc85aa549c2b29e0fd8507a
@@ -490,8 +485,8 @@ axes_properties_3.png=9f69d8bb42f7272cdae59d196cc6a5e7
 axes_properties_4.png=91c4089412926c6fc2e55f37b9f93f3d
 axes_properties_en_US_5.png=2906656fb92aaac4ad891cfa0347f142
 axes_properties_fr_FR_5.png=2906656fb92aaac4ad891cfa0347f142
-axes_properties_ja_JP_5.png=4969e3dd46c4d3d557cae0944088f2c3
-axes_properties_pt_BR_5.png=4969e3dd46c4d3d557cae0944088f2c3
+axes_properties_ja_JP_5.png=2906656fb92aaac4ad891cfa0347f142
+axes_properties_pt_BR_5.png=2906656fb92aaac4ad891cfa0347f142
 axes_properties_ru_RU_5.png=2906656fb92aaac4ad891cfa0347f142
 bar3d_2.png=05ab33f25de5b8c334228dc7ab2ebea2
 bar3d_3.png=46f6541f7b007844a849fe79edaae5ca
diff --git a/scilab/modules/helptools/images/_LaTeX_convol.xml_1.png b/scilab/modules/helptools/images/_LaTeX_convol.xml_1.png
new file mode 100644 (file)
index 0000000..98f0acf
Binary files /dev/null and b/scilab/modules/helptools/images/_LaTeX_convol.xml_1.png differ
diff --git a/scilab/modules/helptools/images/_LaTeX_csc.xml_1.png b/scilab/modules/helptools/images/_LaTeX_csc.xml_1.png
deleted file mode 100644 (file)
index 883af84..0000000
Binary files a/scilab/modules/helptools/images/_LaTeX_csc.xml_1.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_LaTeX_csc.xml_2.png b/scilab/modules/helptools/images/_LaTeX_csc.xml_2.png
deleted file mode 100644 (file)
index 6703389..0000000
Binary files a/scilab/modules/helptools/images/_LaTeX_csc.xml_2.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cscd.xml_1.png b/scilab/modules/helptools/images/_LaTeX_cscd.xml_1.png
deleted file mode 100644 (file)
index 883af84..0000000
Binary files a/scilab/modules/helptools/images/_LaTeX_cscd.xml_1.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cscd.xml_2.png b/scilab/modules/helptools/images/_LaTeX_cscd.xml_2.png
deleted file mode 100644 (file)
index 6703389..0000000
Binary files a/scilab/modules/helptools/images/_LaTeX_cscd.xml_2.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_LaTeX_cspect.xml_1.png b/scilab/modules/helptools/images/_LaTeX_cspect.xml_1.png
new file mode 100644 (file)
index 0000000..c7883ec
Binary files /dev/null and b/scilab/modules/helptools/images/_LaTeX_cspect.xml_1.png differ
diff --git a/scilab/modules/helptools/images/_LaTeX_delip.xml_1.png b/scilab/modules/helptools/images/_LaTeX_delip.xml_1.png
new file mode 100644 (file)
index 0000000..02e83f8
Binary files /dev/null and b/scilab/modules/helptools/images/_LaTeX_delip.xml_1.png differ
diff --git a/scilab/modules/helptools/images/_LaTeX_eig.xml_1.png b/scilab/modules/helptools/images/_LaTeX_eig.xml_1.png
deleted file mode 100644 (file)
index e0b8c37..0000000
Binary files a/scilab/modules/helptools/images/_LaTeX_eig.xml_1.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_LaTeX_pspect.xml_1.png b/scilab/modules/helptools/images/_LaTeX_pspect.xml_1.png
new file mode 100644 (file)
index 0000000..c7883ec
Binary files /dev/null and b/scilab/modules/helptools/images/_LaTeX_pspect.xml_1.png differ
diff --git a/scilab/modules/helptools/images/_MathML_convol.xml_1.png b/scilab/modules/helptools/images/_MathML_convol.xml_1.png
deleted file mode 100644 (file)
index 14d9d3f..0000000
Binary files a/scilab/modules/helptools/images/_MathML_convol.xml_1.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_MathML_cspect.xml_1.png b/scilab/modules/helptools/images/_MathML_cspect.xml_1.png
deleted file mode 100644 (file)
index 155b4bf..0000000
Binary files a/scilab/modules/helptools/images/_MathML_cspect.xml_1.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_MathML_delip.xml_1.png b/scilab/modules/helptools/images/_MathML_delip.xml_1.png
deleted file mode 100644 (file)
index 129cd03..0000000
Binary files a/scilab/modules/helptools/images/_MathML_delip.xml_1.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_MathML_pspect.xml_1.png b/scilab/modules/helptools/images/_MathML_pspect.xml_1.png
deleted file mode 100644 (file)
index 155b4bf..0000000
Binary files a/scilab/modules/helptools/images/_MathML_pspect.xml_1.png and /dev/null differ
index ba4cdb5..7582cfa 100644 (file)
Binary files a/scilab/modules/helptools/images/bode_en_US_2.png and b/scilab/modules/helptools/images/bode_en_US_2.png differ
index ba4cdb5..9e0beb3 100644 (file)
Binary files a/scilab/modules/helptools/images/bode_fr_FR_2.png and b/scilab/modules/helptools/images/bode_fr_FR_2.png differ
index ba4cdb5..d87f329 100644 (file)
Binary files a/scilab/modules/helptools/images/bode_ja_JP_2.png and b/scilab/modules/helptools/images/bode_ja_JP_2.png differ
index ba4cdb5..1e95a3d 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
index ba4cdb5..73eb59b 100644 (file)
Binary files a/scilab/modules/helptools/images/bode_ru_RU_2.png and b/scilab/modules/helptools/images/bode_ru_RU_2.png differ
diff --git a/scilab/modules/helptools/images/datafit_A.png b/scilab/modules/helptools/images/datafit_A.png
new file mode 100644 (file)
index 0000000..8f39916
Binary files /dev/null and b/scilab/modules/helptools/images/datafit_A.png differ
diff --git a/scilab/modules/helptools/images/datafit_B.png b/scilab/modules/helptools/images/datafit_B.png
new file mode 100644 (file)
index 0000000..0a13311
Binary files /dev/null and b/scilab/modules/helptools/images/datafit_B.png differ
diff --git a/scilab/modules/helptools/images/datafit_C.png b/scilab/modules/helptools/images/datafit_C.png
new file mode 100644 (file)
index 0000000..92814e7
Binary files /dev/null and b/scilab/modules/helptools/images/datafit_C.png differ
index 2052309..5403582 100644 (file)
Binary files a/scilab/modules/helptools/images/prettyprint_LaTeX_MathJax.png and b/scilab/modules/helptools/images/prettyprint_LaTeX_MathJax.png differ
index c326818..c925909 100644 (file)
@@ -91,7 +91,8 @@ d = spec(inv(B)*A)
                     <para>
                         If matrix <varname>B</varname> is nonsingular, the generalized
                         eigenvalues can be computed as the eigenvalues of the matrix
-                        <latex>B^{-1}A</latex> i.e. <code>d=spec(B^-1*A)</code>.
+                        <emphasis>B<superscript>-1</superscript>A</emphasis>
+                        i.e. <literal>d=spec(B^-1*A)</literal>.
                     </para>
                 </listitem>
                 <listitem>
index 7108657..1f4400e 100644 (file)
@@ -765,6 +765,9 @@ xstring(-2.5, 0.9, "dmin = " + msprintf("%5.3f", dmin))
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="backslash">backslash</link>
+            </member>
+            <member>
                 <link linkend="lsqrsolve">lsqrsolve</link>
             </member>
             <member>
index b3cfce5..a16ef69 100644 (file)
@@ -80,6 +80,9 @@ xmlGetValues("//general/confirmation-dialogs/body/tools/tool",["id" "state"])
                 <link linkend="xmlGetValues">xmlGetValues</link>
             </member>
             <member>
+                <link linkend="xmlSetValues">xmlSetValues</link>
+            </member>
+            <member>
                 <link linkend="ieee">ieee</link>
             </member>
             <member>
index 273e3aa..0e505c8 100644 (file)
@@ -82,6 +82,9 @@ xmlGetValues("//general/confirmation-dialogs/body/tools/tool",["id" "state"])
                 <link linkend="xmlGetValues">xmlGetValues</link>
             </member>
             <member>
+                <link linkend="xmlSetValues">xmlSetValues</link>
+            </member>
+            <member>
                 <link linkend="ieee">ieee</link>
             </member>
             <member>
index bebfab4..abe1e35 100644 (file)
@@ -80,6 +80,9 @@ xmlGetValues("//general/confirmation-dialogs/body/tools/tool",["id" "state"])
                 <link linkend="xmlGetValues">xmlGetValues</link>
             </member>
             <member>
+                <link linkend="xmlSetValues">xmlSetValues</link>
+            </member>
+            <member>
                 <link linkend="ieee">ieee</link>
             </member>
             <member>
index 76710f7..ef9cbe0 100644 (file)
@@ -80,6 +80,9 @@ xmlGetValues("//general/confirmation-dialogs/body/tools/tool",["id" "state"])
                 <link linkend="xmlGetValues">xmlGetValues</link>
             </member>
             <member>
+                <link linkend="xmlSetValues">xmlSetValues</link>
+            </member>
+            <member>
                 <link linkend="ieee">ieee</link>
             </member>
             <member>
index eaba920..b2764dc 100644 (file)
@@ -7,8 +7,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [y]=convol(h,x)
-            [y,e1]=convol(h,x,e0)
+            y = convol(h, x)
+            [y,e1] = convol(h, x, e0)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <para>
             Calculates the convolution <literal>y= h*x</literal> of two discrete
             sequences by using the fft. The convolution is defined as follows:
-        </para>
-        <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata>
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:msub>
-                                        <mml:mi>y</mml:mi>
-                                        <mml:mi>k</mml:mi>
-                                    </mml:msub>
-                                    <mml:mo mml:stretchy="false">=</mml:mo>
-                                    <mml:mrow>
-                                        <mml:mrow>
-                                            <mml:msub>
-                                                <mml:mo mml:stretchy="false">∑</mml:mo>
-                                                <mml:mi>j</mml:mi>
-                                            </mml:msub>
-                                            <mml:msub>
-                                                <mml:mi>h</mml:mi>
-                                                <mml:mi>j</mml:mi>
-                                            </mml:msub>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">∗</mml:mo>
-                                        <mml:msub>
-                                            <mml:mi>x</mml:mi>
-                                            <mml:mrow>
-                                                <mml:mrow>
-                                                    <mml:mi>k</mml:mi>
-                                                    <mml:mo mml:stretchy="false">+</mml:mo>
-                                                    <mml:mn>1</mml:mn>
-                                                </mml:mrow>
-                                                <mml:mo mml:stretchy="false">−</mml:mo>
-                                                <mml:mi>j</mml:mi>
-                                            </mml:mrow>
-                                        </mml:msub>
-                                    </mml:mrow>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0">y_k=sum_j h_j*x_{k+1-j}
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
+            <latex style="display" alt="y_k = sum_j( h_j * x_{k+1-k} )">
+                y_k \,= \sum_j h_j \; x_{k+1-j}
+            </latex>
         </para>
         <para>Overlap add method can be used.</para>
         <para>USE OF OVERLAP ADD METHOD: For
-            <literal>x=[x1,x2,...,xNm1,xN]</literal> First call is
-            <literal>[y1,e1]=convol(h,x1);</literal> Subsequent calls :
-            <literal>[yk,ek]=convol(h,xk,ekm1)</literal>; Final call :
-            <literal>[yN]=convol(h,xN,eNm1);</literal> Finally
-            <literal>y=[y1,y2,...,yNm1,yN]</literal>.
+            <literal>x = [x1, x2,..., xNm1, xN]</literal> First call is
+            <literal>[y1, e1] = convol(h, x1);</literal> Subsequent calls :
+            <literal>[yk, ek] = convol(h, xk, ekm1)</literal>; Final call :
+            <literal>[yN] = convol(h, xN, eNm1);</literal> Finally
+            <literal>y = [y1, y2,..., yNm1, yN]</literal>.
         </para>
         <para>The algorithm based on the convolution definition is
             implemented for polynomial
-            product: <literal>y=convol(h,x)</literal> is equivalent
-            to <literal>y=coeff(poly(h,'z','c')*poly(x,'z','c')</literal> but
+            product: <literal>y = convol(h, x)</literal> is equivalent
+            to <literal>y = coeff(poly(h,'z','c') * poly(x,'z','c'))</literal> but
             much more efficient if <literal>x</literal> is a "long" array.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-x=1:3;
-h1=[1,0,0,0,0];h2=[0,1,0,0,0];h3=[0,0,1,0,0];
-x1=convol(h1,x),x2=convol(h2,x),x3=convol(h3,x),
-convol(h1+h2+h3,x)
-p1=poly(x,'x','coeff')
-p2=poly(h1+h2+h3,'x','coeff')
-p1*p2
+x = 1:3;
+h1 = [1,0,0,0,0];
+h2 = [0,1,0,0,0];
+h3 = [0,0,1,0,0];
+x1 = convol(h1, x)
+x2 = convol(h2, x)
+x3 = convol(h3, x)
+convol(h1+h2+h3, x)
+p1 = poly(x,'x','coeff')
+p2 = poly(h1+h2+h3, 'x', 'coeff')
+p1 * p2
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 915daa0..b26f664 100644 (file)
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [sm [,cwp]]=cspect(nlags,npoints,wtype,x [,y] [,wpar])
-            [sm [,cwp]]=cspect(nlags,npoints,wtype,nx [,ny] [,wpar])
+            sm = cspect(nlags, npoints, wtype, x)
+            sm = cspect(nlags, npoints, wtype, x, y)
+            sm = cspect(nlags, npoints, wtype, nx)
+            sm = cspect(nlags, npoints, wtype, nx, ny)
+            [sm, cwp] = cspect(.., wpar)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -42,8 +45,7 @@
                     <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).
+                        user defined function named <literal>getx</literal> (see below).
                     </para>
                 </listitem>
             </varlistentry>
                         </listitem>
                         <listitem>
                             <para>
-                                <literal>'kr'</literal>: Kaiser,in this case the wpar
+                                <literal>'kr'</literal>: Kaiser, in this case the <literal>wpar</literal>
                                 argument must be given
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                                <literal>'ch'</literal>: Chebyshev, in this case the wpar
+                                <literal>'ch'</literal>: Chebyshev, in this case the <literal>wpar</literal>
                                 argument must be given
                             </para>
                         </listitem>
                 <term>wpar</term>
                 <listitem>
                     <para>
-                        optional parameters for <literal>Kaiser and Chebyshev
-                            windows:
-                        </literal>
+                        optional parameters for Kaiser and Chebyshev windows:
                     </para>
                     <itemizedlist>
                         <listitem>
                             <para>
-                                'kr': <literal>wpar must be a strictly positive
-                                    number
-                                </literal>
+                                'kr': <literal>wpar</literal> must be a strictly positive number
                             </para>
                         </listitem>
                         <listitem>
                             <para>
                                 'ch': <literal>wpar</literal> must be a 2 element vector
-                                <literal> [main_lobe_width,side_lobe_height]with
-                                </literal>
+                                <literal> [main_lobe_width,side_lobe_height]</literal> with
                                 <literal>0&lt;main_lobe_width&lt;.5</literal>, and
                                 <literal>side_lobe_height&gt;0</literal>
                             </para>
                 <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 a row array of size <varname>npoints</varname>. The array
                         is real in case of auto-correlation and complex in case of
                         cross-correlation.
                     </para>
     <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
+            <varname>x</varname> and <varname>y</varname> if both are given and the
+            auto-spectral estimate of <varname>x</varname> 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>
+            The cross-spectrum of two signal <varname>x</varname> and <varname>y</varname> is defined to be
+            <latex style="display"
+                alt="S_xy(ω) = (∑{n=0…N-1} x(n) exp(-i ω n)).
+                               (∑{n=0…N-1} y'(n) exp(i ω n)) / N">
+                S_{xy} (\omega) = {1 \over N}
+                \left(\sum_{n=0}^{N-1} x(n)\,e^{-i \omega n}\right)
+                \left( \sum_{n=0}^{N-1} \bar{y}(n)\,e^{i \omega n} \right)
+            </latex>
         </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
+            overlapping sub-segments of 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:
+            For batch processing, the <varname>x</varname> and <varname>y</varname> 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
+            <literal>yk=gety(ns,offset)</literal> where <varname>ns</varname> is the
+            segment size and <varname>offset</varname> is the index of the first
             element of the segment in the full signal.
         </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))
+rand('normal');
+rand('seed',0);
+x = rand(1:1024-33+1);
+
+// make low-pass filter with eqfir
+[nf, bedge, des, wate] = (33, [0 .1;.125 .5], [1 0], [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), 'r')
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 0e3e6d5..64c3163 100644 (file)
     <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])
+            sm = pspect(sec_step, sec_leng, wtype, x)
+            sm = pspect(sec_step, sec_leng, wtype, x, y)
+            sm = pspect(sec_step, sec_leng, wtype, nx)
+            sm = pspect(sec_step, sec_leng, wtype, nx, ny)
+            [sm, cwp] = pspect(.., wpar)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
                 <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
+                        offset of each data window. The overlap <literal>D</literal>
+                        is given by <literal>sec_leng - sec_step</literal>. If
+                        <literal>sec_step == sec_leng/2</literal> 50% overlap is made.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>wpar</term>
                 <listitem>
                     <para>
-                        optional parameters for <literal>Kaiser and Chebyshev
-                            windows:
-                        </literal>
+                        optional parameters for Kaiser and Chebyshev windows:
                     </para>
                     <itemizedlist>
                         <listitem>
                             <para>
-                                'kr': <literal>wpar must be a strictly positive
-                                    number
-                                </literal>
+                                'kr': <literal>wpar</literal> must be a strictly positive number
                             </para>
                         </listitem>
                         <listitem>
                             <para>
                                 'ch': <literal>wpar</literal> must be a 2 element vector
-                                <literal> [main_lobe_width,side_lobe_height]with
-                                </literal>
+                                <literal> [main_lobe_width,side_lobe_height]</literal> with
                                 <literal>0&lt;main_lobe_width&lt;.5</literal>, and
                                 <literal>side_lobe_height&gt;0</literal>
                             </para>
                     <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
+                        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
             <varlistentry>
                 <term>cwp</term>
                 <listitem>
-                    <para>unspecified Chebyshev window parameter in case of Chebyshev
+                    <para>
+                        the unspecified Chebyshev window parameter in case of Chebyshev
                         windowing, or an empty matrix.
                     </para>
                 </listitem>
     <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
+            <varname>x</varname> and <varname>y</varname> if both are given and the
+            auto-spectral estimate of <varname>x</varname> 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>
+            The cross spectrum of two signal <varname>x</varname> and  <varname>y</varname>
+            is defined as
+            <latex style="display"
+                alt="S_xy(ω) = (∑{n=0…N-1} x(n) exp(-i ω n)).
+                               (∑{n=0…N-1} y'(n) exp(i ω n)) / N">
+                S_{xy} (\omega) = {1 \over N}
+                \left(\sum_{n=0}^{N-1} x(n)\,e^{-i \omega n}\right)
+                \left( \sum_{n=0}^{N-1} \bar{y}(n)\,e^{i \omega n} \right)
+            </latex>
         </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
+            in <varname>x</varname> and <varname>y</varname>. 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
+            For batch processing, the <varname>x</varname> and
+            <varname>y</varname> 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
+            <literal>xk = getx(ns,offset)</literal> and
+            <literal>yk = gety(ns,offset)</literal> where <varname>ns</varname> is the
+            segment size and <varname>offset</varname> is the index of the first
             element of the segment in the full signal.
         </para>
     </refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 rand('normal');rand('seed',0);
-x=rand(1:1024-33+1);
+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);
+// 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));
+// 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));
+// 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));
+// pspect example
+sm = pspect(100,200,'tr',y);
+smsize = max(size(sm));
+fr = (1:smsize) / smsize;
+plot(fr, log(sm), 'r');
 rand('unif');
  ]]></programlisting>
     </refsection>
index 3b0410c..d276341 100644 (file)
 <?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: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="convol" 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: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="convol" xml:lang="ja">
     <refnamediv>
-
         <refname>convol</refname>
-
         <refpurpose>畳込み(コンボリューション)</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>
-
-            [y]=convol(h,x)
-
-            [y,e1]=convol(h,x,e0)
-
+            y = convol(h, x)
+            [y,e1] = convol(h, x, e0)
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>h</term>
-
                 <listitem>
-
                     <para>ベクトル, 最初の入力シーケンス ("短い" シーケンス) </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>x</term>
-
                 <listitem>
-
                     <para>ベクトル, 第2の入力シーケンス ( "長い" シーケンス)</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>e0</term>
-
                 <listitem>
-
                     <para>ベクトル,オーバーラップ加算のための前の結果の末尾 (最初のコールでは使用されません)</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>y</term>
-
                 <listitem>
-
                     <para>ベクトル, 畳込み. </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>e1</term>
-
                 <listitem>
-
                     <para>オーバーラップ加算のための新規結果の末尾 (最後のコールでは使用されません)</para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             fftを用いて2つの離散シーケンスの畳込み <literal>y= h*x</literal>
-
             を計算します.
-
             畳込みは以下のように定義されます:
-
+            <latex style="display" alt="y_k = sum_j( h_j * x_{k+1-k} )">
+                y_k \,= \sum_j h_j \; x_{k+1-j}
+            </latex>
         </para>
-
-        <para>
-
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata>
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:msub>
-                                        <mml:mi>y</mml:mi>
-                                        <mml:mi>k</mml:mi>
-                                    </mml:msub>
-                                    <mml:mo mml:stretchy="false">=</mml:mo>
-                                    <mml:mrow>
-                                        <mml:mrow>
-                                            <mml:msub>
-                                                <mml:mo mml:stretchy="false">∑</mml:mo>
-                                                <mml:mi>j</mml:mi>
-                                            </mml:msub>
-                                            <mml:msub>
-                                                <mml:mi>h</mml:mi>
-                                                <mml:mi>j</mml:mi>
-                                            </mml:msub>
-                                        </mml:mrow>
-                                        <mml:mo mml:stretchy="false">∗</mml:mo>
-                                        <mml:msub>
-                                            <mml:mi>x</mml:mi>
-                                            <mml:mrow>
-                                                <mml:mrow>
-                                                    <mml:mi>k</mml:mi>
-                                                    <mml:mo mml:stretchy="false">+</mml:mo>
-                                                    <mml:mn>1</mml:mn>
-                                                </mml:mrow>
-                                                <mml:mo mml:stretchy="false">−</mml:mo>
-                                                <mml:mi>j</mml:mi>
-                                            </mml:mrow>
-                                        </mml:msub>
-                                    </mml:mrow>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0">y_k=sum_j h_j*x_{k+1-j}
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
-        </para>
-
         <para>オーバーラップ加算法を使用できます.</para>
-
         <para>オーバーラップ加算の使用例:
-
-            <literal>x=[x1,x2,...,xNm1,xN]</literal>の時,
-
-            最初のコールは,
-
-            <literal>[y1,e1]=convol(h,x1);</literal>
-
-            その後のコール :
-
-            <literal>[yk,ek]=convol(h,xk,ekm1)</literal>; 最後のコール :
-
-            <literal>[yN]=convol(h,xN,eNm1);</literal> 結果は,
-
-            <literal>y=[y1,y2,...,yNm1,yN]</literal>.
-
+            <literal>x = [x1,x2,...,xNm1,xN]</literal> の時, 最初のコールは,
+            <literal>[y1,e1] = convol(h,x1);</literal> その後のコール :
+            <literal>[yk,ek] = convol(h,xk,ekm1)</literal>; 最後のコール :
+            <literal>[yN] = convol(h,xN,eNm1)</literal> 結果は,
+            <literal>y = [y1,y2,...,yNm1,yN]</literal>.
         </para>
-
         <para>
-
             畳込みの定義に基づくアルゴリズムは,多項式の積として実装されます:
-
-            <literal>y=convol(h,x)</literal>は,
-
-            <literal>y=coeff(poly(h,'z','c')*poly(x,'z','c')</literal>と等価ですが、
-
-            <literal>x</literal>が"長い"配列の場合には,はるかに効率的です.
-
+            <literal>y = convol(h,x)</literal> は,
+            <literal>y = coeff(poly(h,'z','c')*poly(x,'z','c'))</literal> と等価ですが、
+            <literal>x</literal> が"長い"配列の場合には,はるかに効率的です.
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
-x=1:3;
-h1=[1,0,0,0,0];h2=[0,1,0,0,0];h3=[0,0,1,0,0];
-x1=convol(h1,x),x2=convol(h2,x),x3=convol(h3,x),
-convol(h1+h2+h3,x)
-p1=poly(x,'x','coeff')
-p2=poly(h1+h2+h3,'x','coeff')
-p1*p2
+x = 1:3;
+h1 = [1,0,0,0,0];
+h2 = [0,1,0,0,0];
+h3 = [0,0,1,0,0];
+x1 = convol(h1, x)
+x2 = convol(h2, x)
+x3 = convol(h3, x)
+convol(h1+h2+h3, x)
+p1 = poly(x,'x','coeff')
+p2 = poly(h1+h2+h3, 'x', 'coeff')
+p1 * p2
  ]]></programlisting>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="corr">corr</link>
-
             </member>
-
             <member>
-
                 <link linkend="fft">fft</link>
-
             </member>
-
             <member>
-
                 <link linkend="pspect">pspect</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
index 5be163a..9ae45fe 100644 (file)
 <?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="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: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="ja">
     <refnamediv>
-
         <refname>cspect</refname>
-
         <refpurpose>
-
             相関法により2つの離散時間信号の間で推定する
-
             両側相互スペクトル
-
         </refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>
-
-            [sm [,cwp]]=cspect(nlags,npoints,wtype,x [,y] [,wpar])
-
-            [sm [,cwp]]=cspect(nlags,npoints,wtype,nx [,ny] [,wpar])
-
+            sm = cspect(nlags, npoints, wtype, x)
+            sm = cspect(nlags, npoints, wtype, x, y)
+            sm = cspect(nlags, npoints, wtype, nx)
+            sm = cspect(nlags, npoints, wtype, nx, ny)
+            [sm, cwp] = cspect(.., wpar)
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>x</term>
-
                 <listitem>
-
                     <para>ベクトル, 最初の信号のデータ.</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>y</term>
-
                 <listitem>
-
                     <para>
-
                         ベクトル, 二番目の信号のデータ. <literal>y</literal>を
-
                         省略した場合,<literal>x</literal>に等しいと仮定されます(自己相関).
-
                         指定された場合,<literal>x</literal>と同じ数の要素を有している必要が
-
                         あります.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>nx</term>
-
                 <listitem>
-
                     <para>
-
                         スカラー : <literal>x</literal>信号の点の数. この場合,
-
                         信号xのセグメントは<literal>getx</literal>という名前のユーザ定義の関数
-
                         により読み込まれます (下記参照).
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>ny</term>
-
                 <listitem>
-
                     <para>スカラー :
-
                         <literal>y</literal>信号の点の数. この場合,
-
                         <literal>y</literal>のセグメントが <literal>gety</literal>
-
                         という名前のユーザ定義関数により読み込まれます (下記参照).
-
                         指定された場合,<literal>ny</literal>は<literal>nx</literal>に
-
                         等しくする必要があります.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>nlags</term>
-
                 <listitem>
-
                     <para>相関遅延の数 (正の整数)</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>npoints</term>
-
                 <listitem>
-
                     <para>変換する点の数 (正の整数)</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>wtype</term>
-
                 <listitem>
-
                     <para>ウインドウ型</para>
-
                     <itemizedlist>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'re'</literal>: 矩形
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'tr'</literal>: 三角形
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'hm'</literal>: ハミング
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'hn'</literal> : ハニング
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'kr'</literal>: カイザー,この場合,wpar
-
                                 引数を指定する必要があります
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'ch'</literal>: チェビシェフ, この場合, wpar
-
                                 引数を指定する必要があります
-
                             </para>
-
                         </listitem>
-
                     </itemizedlist>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>wpar</term>
-
                 <listitem>
-
                     <para>
-
                         <literal>カイザーおよびチェビシェフ
-
                             ウインドウに関するオプションパラメータ:
-
                         </literal>
-
                     </para>
-
                     <itemizedlist>
-
                         <listitem>
-
                             <para>
-
                                 'kr': <literal>wpar は厳密に正の数である必要があります</literal>
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 'ch': <literal>wpar</literal> は要素数2のベクトル
-
                                 <literal> [main_lobe_width,side_lobe_height]である必要があります.
-
                                     ただし,
-
                                 </literal>
-
                                 <literal>0&lt;main_lobe_width&lt;.5</literal>, および
-
                                 <literal>side_lobe_height&gt;0</literal>
-
                             </para>
-
                         </listitem>
-
                     </itemizedlist>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>sm</term>
-
                 <listitem>
-
                     <para>
-
                         正規化された周波数の間隔<literal>[0,1]</literal>において
-
                         パワースペクトルを推定します.
-
                         大きさ<literal>npoints</literal>の行配列です.
-
                         自己相関関数の場合は実数,
-
                         相互相関関数の場合は複素数の配列です.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>cwp</term>
-
                 <listitem>
-
                     <para>
-
                         チェビシェフウインドウの場合は,チェビシェフウインドウのパラメータ
-
                         の未指定のもの.
-
                         指定されていないチェビシェフウインドウのパラメータ
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             2つの信号<literal>x</literal> および <literal>y</literal>の
-
             信号の相互スペクトル,そうでない場合は <literal>x</literal>を計算します.
-
             スペクトル密度は相関法により得られます.
-
+            <latex style="display"
+                alt="S_xy(ω) = (∑{n=0…N-1} x(n) exp(-i ω n)).
+                               (∑{n=0…N-1} y'(n) exp(i ω n)) / N">
+                S_{xy} (\omega) = {1 \over N}
+                \left(\sum_{n=0}^{N-1} x(n)\,e^{-i \omega n}\right)
+                \left( \sum_{n=0}^{N-1} \bar{y}(n)\,e^{i \omega n} \right)
+            </latex>
         </para>
-
-        <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>
-
             相関法は自己/相互相関関数の修正された推定値の
-
             フーリエ変換としてスペクトル推定を計算します.
-
             この自己/相互相関修正推定は,
-
             データの場合はオーバーラップしたサブ区間から
-
             反復的に計算する自己相関関数の推定値と,
-
             この後,結果を得るためのこれらの推定値の平均化
-
             からなります.
-
         </para>
-
         <para>ウインドウの点数は
-
             <literal>2*nlags-1</literal>です.
-
         </para>
-
         <para>
-
             バッチ処理の場合,
-
             <literal>x</literal> と<literal>y</literal> のデータは,
-
             ユーザ定義関数<literal>getx</literal>および<literal>gety</literal>
-
             によりセグメント毎に読み込むことができます.
-
             これらの関数は以下の呼び出し手順を有します:
-
         </para>
-
         <para>
-
             <literal>xk=getx(ns,offset)</literal> および
-
             <literal>yk=gety(ns,offset)</literal>
-
             ただし, <literal>ns</literal> はセグメントの大きさ,
-
             <literal>offset</literal> は信号全体の最初のセグメント要素の
-
             添字です.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>警告</title>
-
         <para>5.0.2までのバージョンのScilabでは,返り値は
-
             現在の値の絶対値でした.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>参考文献</title>
-
         <para>Oppenheim, A.V., and R.W. Schafer. Discrete-Time Signal Processing,
-
             Upper Saddle River, NJ: Prentice-Hall, 1999
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
-rand('normal');rand('seed',0);
-x=rand(1:1024-33+1);
-//eqfirでローパスフィルタを作成m
-nf=33;bedge=[0 .1;.125 .5];des=[1 0];wate=[1 1];
-h=eqfir(nf,bedge,des,wate);
-//有色のデータを得るために白色のデータをフィルタ処理
-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))
+rand('normal');
+rand('seed',0);
+x = rand(1:1024-33+1);
+
+// eqfirでローパスフィルタを作成m
+[nf, bedge, des, wate] = (33, [0 .1;.125 .5], [1 0], [1 1]);
+h = eqfir(nf, bedge, des, wate);
+
+// 有色のデータを得るために白色のデータをフィルタ処理
+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>参照</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>
-
+</refentry>
\ No newline at end of file
index 8c6b765..ac8eef2 100644 (file)
 <?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="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: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="ja">
     <refnamediv>
-
         <refname>pspect</refname>
-
         <refpurpose>
-
             Welchの平均ペリオドグラム法による
-
             2つの離散時間信号の間の両面相互スペクトル推定.
-
         </refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>
-
-            [sm [,cwp]]=pspect(sec_step,sec_leng,wtype,x [,y] [,wpar])
-
-            [sm [,cwp]]=pspect(sec_step,sec_leng,wtype,nx [,ny] [,wpar])
-
+            sm = pspect(sec_step, sec_leng, wtype, x)
+            sm = pspect(sec_step, sec_leng, wtype, x, y)
+            sm = pspect(sec_step, sec_leng, wtype, nx)
+            sm = pspect(sec_step, sec_leng, wtype, nx, ny)
+            [sm, cwp] = pspect(.., wpar)
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>x</term>
-
                 <listitem>
-
                     <para>ベクトル, 最初の信号の時間領域標本.</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>y</term>
-
                 <listitem>
-
                     <para>
-
                         ベクトル, 2番目の信号の時間領域標本. <literal>y</literal>が
-
                         省略された場合,<literal>x</literal>に等しいと仮定されます(自己相関).
-
                         指定された場合, <literal>x</literal>と同じ数の要素を有している必要があります.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>nx</term>
-
                 <listitem>
-
                     <para>
-
                         スカラー : <literal>x</literal>信号の標本数.
-
                         この場合,<literal>x</literal>信号のセグメントは<literal>getx</literal>という名前の
-
                         ユーザ定義の関数によりロードされます (下記参照).
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>ny</term>
-
                 <listitem>
-
                     <para>
-
                         スカラー : <literal>y</literal>信号の標本数.
-
                         この場合,<literal>x</literal>信号のセグメントは<literal>gety</literal>という名前の
-
                         ユーザ定義の関数によりロードされます (下記参照).
-
                         指定された場合, <literal>ny</literal>は<literal>nx</literal>と等しい必要があります.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>sec_step</term>
-
                 <listitem>
-
                     <para>
-
                         各データウインドウのオフセット.
-
                         オーバーラップ <literal>D</literal> はi <literal>sec_leng -sec_step</literal>により指定されます.
-
                         <literal>sec_step==sec_leng/2</literal>の場合, 50% オーバーラップとなります.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>sec_leng</term>
-
                 <listitem>
-
                     <para>ウインドウの点の数.</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>wtype</term>
-
                 <listitem>
-
                     <para>ウインドウの種類</para>
-
                     <itemizedlist>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'re'</literal>: 矩形
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'tr'</literal>: 三角形
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'hm'</literal>: ハミング
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'hn'</literal> : ハニング
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'kr'</literal>: カイザー,この場合,wpar引数を指定する必要があります
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 <literal>'ch'</literal>: チェビシェフ, この場合,wpar引数を指定する必要があります
-
                             </para>
-
                         </listitem>
-
                     </itemizedlist>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>wpar</term>
-
                 <listitem>
-
                     <para>
-
                         <literal>カイザーおよびチェビシェフウインドウ</literal>に関する
-
                         オプションのパラメータ:
-
                     </para>
-
                     <itemizedlist>
-
                         <listitem>
-
                             <para>
-
                                 'kr': <literal>wpar</literal>は厳密に正の数とする必要があります
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>
-
                                 'ch': <literal>wpar</literal> は要素数2のベクトル
-
                                 <literal> [main_lobe_width,side_lobe_height]</literal>
-
                                 とする必要があります.
-
                                 ただし,<literal>0&lt;main_lobe_width&lt;.5</literal>, および
-
                                 <literal>side_lobe_height&gt;0</literal>です.
-
                             </para>
-
                         </listitem>
-
                     </itemizedlist>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>sm</term>
-
                 <listitem>
-
                     <para>
-
                         正規化された周波数の範囲 <literal>[0,1]</literal>における両面スペクトル推定.
-
                         これは,<literal>sec_len</literal>個の要素を有する行配列です.
-
                         この配列は自己相関の場合には実数,相互相関の場合には複素数となります.
-
                     </para>
-
                     <para>
-
                         関係する正規化された周波数配列は
-
                         <literal>linspace(0,1,sec_len)</literal>です.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>cwp</term>
-
                 <listitem>
-
                     <para>
-
                         チェビシェフウインドの場合は
-
                         チェビシェフウインドウの未指定のパラメータ,
-
                         または空の行列.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             2つの信号<literal>x</literal> および <literal>y</literal>が両方共指定
-
             された場合,相互スペクトル推定値,
-
             そうでない場合に自己相関スペクトルを計算します.
-
             修正ペリオドグラム法により得られたスペクトル推定値.
-
         </para>
-
         <para>
-
             2つの信号<literal>x</literal> および  <literal>y</literal>の
-
             相互スペクトルは以下のように定義されます
-
-        </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>
-
+            <latex style="display"
+                alt="S_xy(ω) = (∑{n=0…N-1} x(n) exp(-i ω n)).
+                               (∑{n=0…N-1} y'(n) exp(i ω n)) / N">
+                S_{xy} (\omega) = {1 \over N}
+                \left(\sum_{n=0}^{N-1} x(n)\,e^{-i \omega n}\right)
+                \left( \sum_{n=0}^{N-1} \bar{y}(n)\,e^{i \omega n} \right)
+            </latex>
         </para>
-
         <para>
-
             スペクトル推定の修正ペリオドグラム法は,
-
             <literal>x</literal> および <literal>y</literal>に含まれる
-
             データのウインドウ処理されたサブセクションのペリオドグラムを
-
             繰り返し計算します.
-
             これらのペリオドグラムは,最終的なスペクトル推定値を得るために平均化され,
-
             適当な定数により正規化されます.
-
             これは推定値の分散を減らすための平均化処理です.
-
         </para>
-
         <para>
-
             バッチ処理の場合, <literal>x</literal> および
-
             <literal>y</literal> データはユーザ定義関数
-
             <literal>getx</literal> および <literal>gety</literal>により
-
             セグメント毎に読まれます.
-
             これらの関数の呼び出し手順は以下のようになります:
-
         </para>
-
         <para>
-
-            <literal>xk=getx(ns,offset)</literal> および
-
-            <literal>yk=gety(ns,offset)</literal>. ただし,<literal>ns</literal> は
-
+            <literal>xk = getx(ns,offset)</literal> および
+            <literal>yk = gety(ns,offset)</literal>. ただし,<literal>ns</literal> は
             セグメントの大きさ, <literal>offset</literal> は
-
             完全な信号のセグメントの最初の要素のインデックスです.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>参考文献</title>
-
         <para>Oppenheim, A.V., and R.W. Schafer. Discrete-Time Signal Processing,
-
             Upper Saddle River, NJ: Prentice-Hall, 1999
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</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));
+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>参照</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>
-
+</refentry>
\ No newline at end of file
diff --git a/scilab/modules/signal_processing/help/ru_RU/correlation_convolution/convol.xml b/scilab/modules/signal_processing/help/ru_RU/correlation_convolution/convol.xml
new file mode 100644 (file)
index 0000000..01a78f1
--- /dev/null
@@ -0,0 +1,111 @@
+<?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: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="convol" xml:lang="ru">
+    <refnamediv>
+        <refname>convol</refname>
+        <refpurpose>Свёртка</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Синтаксис</title>
+        <synopsis>
+            y = convol(h, x)
+            [y,e1] = convol(h, x, e0)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Аргументы</title>
+        <variablelist>
+            <varlistentry>
+                <term>h</term>
+                <listitem>
+                    <para>вектор, первая входная последовательность ("короткая");</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>x</term>
+                <listitem>
+                    <para>вектор, вторая входная последовательность ("длинная");</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>e0</term>
+                <listitem>
+                    <para>
+                        вектор, старый остаток для добавления перекрытия (не
+                        используется в первом вызове);
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y</term>
+                <listitem>
+                    <para>вектор, свёртка; </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>e1</term>
+                <listitem>
+                    <para>
+                        новый остаток для добавления перекрытия (не используется
+                        в последнем вызове).
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Описание</title>
+        <para>
+            Вычисляет свёртку <literal>y= h*x</literal> двух дискретных
+            последовательностей с помощю БПФ (fft). Свёртка определяется следующим
+            образом:
+            <latex style="display" alt="y_k = sum_j( h_j * x_{k+1-k} )">
+                y_k \,= \sum_j h_j \; x_{k+1-j}
+            </latex>
+        </para>
+        <para>Может быть использован метод добавления перекрытия.</para>
+        <para>ИСПОЛЬЗОВАНИЕ МЕТОДА ДОБАВЛЕНИЯ ПЕРЕКРЫТИЯ: Для
+            <literal>x = [x1, x2,..., xNm1, xN]</literal> Первый вызов:
+            <literal>[y1, e1] = convol(h, x1);</literal> Последующие вызовы:
+            <literal>[yk, ek] = convol(h, xk, ekm1)</literal>; Последний вызов:
+            <literal>[yN] = convol(h, xN, eNm1);</literal> Наконец
+            <literal>y = [y1, y2,..., yNm1, yN]</literal>.
+        </para>
+        <para>
+            Алгоритм, основанный на определении свёртки, реализован для произведения
+            полиномов: <literal>y = convol(h, x)</literal> эквивалентен
+            <literal>y = coeff(poly(h,'z','c') * poly(x,'z','c'))</literal>, но
+            гораздо более эффективен, если <literal>x</literal> является "длинным"
+            массивом.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="example"><![CDATA[
+x = 1:3;
+h1 = [1,0,0,0,0];
+h2 = [0,1,0,0,0];
+h3 = [0,0,1,0,0];
+x1 = convol(h1, x)
+x2 = convol(h2, x)
+x3 = convol(h3, x)
+convol(h1+h2+h3, x)
+p1 = poly(x,'x','coeff')
+p2 = poly(h1+h2+h3, 'x', 'coeff')
+p1 * p2
+ ]]></programlisting>
+    </refsection>
+    <refsection role="see also">
+        <title>Смотрите также</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="corr">corr</link>
+            </member>
+            <member>
+                <link linkend="fft">fft</link>
+            </member>
+            <member>
+                <link linkend="pspect">pspect</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/signal_processing/help/ru_RU/spectral_estimation/cspect.xml b/scilab/modules/signal_processing/help/ru_RU/spectral_estimation/cspect.xml
new file mode 100644 (file)
index 0000000..1b74a2b
--- /dev/null
@@ -0,0 +1,254 @@
+<?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="ru">
+    <refnamediv>
+        <refname>cspect</refname>
+        <refpurpose>
+            двусторонняя кросс-спектральная оценка между 2 дискретными во времени сигналами, используя метод корреляции.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Синтаксис</title>
+        <synopsis>
+            sm = cspect(nlags, npoints, wtype, x)
+            sm = cspect(nlags, npoints, wtype, x, y)
+            sm = cspect(nlags, npoints, wtype, nx)
+            sm = cspect(nlags, npoints, wtype, nx, ny)
+            [sm, cwp] = cspect(.., wpar)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Аргументы</title>
+        <variablelist>
+            <varlistentry>
+                <term>x</term>
+                <listitem>
+                    <para>вектор, данные первого сигнала.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y</term>
+                <listitem>
+                    <para>
+                        вектор, данные второго сигнала сигнала. Если
+                        <varname>y</varname> пропущен, то он предполагается равным
+                        <varname>x</varname> (автокорреляция). Если он имеется в наличии, то он
+                        должен иметь то же количество элементов, что и <varname>x</varname>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>nx</term>
+                <listitem>
+                    <para>
+                        скаляр: количество точек в сигнале <varname>x</varname>.
+                        В этом случае сегменты сигнала <varname>x</varname> загружены
+                        пользовательской функцией с именем <literal>getx</literal> (см. ниже).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>ny</term>
+                <listitem>
+                    <para>
+                        скаляр: количество точек в сигнале <varname>y</varname>.
+                        В этом случае сегменты сигнала <varname>y</varname> загружены
+                        пользовательской функцией с именем <literal>gety</literal> (см. ниже).
+                        Если указан, то <literal>ny</literal> должен быть равен
+                        <literal>nx</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>nlags</term>
+                <listitem>
+                    <para>количество сдвигов корреляции (положительное целое число)</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>npoints</term>
+                <listitem>
+                    <para>количество точек преобразования (положительное целое число)</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>wtype</term>
+                <listitem>
+                    <para>Тип окна</para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>
+                                <literal>'re'</literal>: прямоугольное
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'tr'</literal>: треугольное
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'hm'</literal>: Хэмминга
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'hn'</literal>: Хана
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'kr'</literal>: Кайзера, в этом случае должен
+                                быть указан аргумент <literal>wpar</literal>
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'ch'</literal>: Чебышева, в этом случае должен
+                                быть указан аргумент <literal>wpar</literal>
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>wpar</term>
+                <listitem>
+                    <para>
+                        необязательный параметр для окон Кайзера и Чебышева:
+                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>
+                                'kr': <literal>wpar</literal> должен быть строго положительным числом
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                'ch': <literal>wpar</literal> должен быть двухэлементным вектором
+                                <literal> [main_lobe_width, side_lobe_height]</literal> где
+                                <literal>0&lt;main_lobe_width&lt;.5</literal> и
+                                <literal>side_lobe_height&gt;0</literal>
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>sm</term>
+                <listitem>
+                    <para>
+                        Спектральная оценка мощности в интервале <literal>[0,1]</literal>
+                        нормированных частот. Это вектор-строка размером
+                        <varname>npoints</varname>. Массив является вещественным в случае
+                        автокорреляции и комплексным - в случае кросс-корреляции.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>cwp</term>
+                <listitem>
+                    <para>
+                        неопределённый параметр окна Чебышева в случае Чебышевской
+                        оконной обработки, либо пустая матрица.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Описание</title>
+        <para>
+            Вычисляет кросс-спектральную оценку двух сигналов <varname>x</varname>
+            и <varname>y</varname> если указаны оба, и автоспектральную оценку
+            для <varname>x</varname> в противном случае. Спектральная оценка,
+            получена с помощью метода корреляции.
+        </para>
+        <para>
+            Кросс-спектр двух сигналов <varname>x</varname> и  <varname>y</varname>
+            определяется как
+            <latex style="display"
+                alt="S_xy(ω) = (∑{n=0…N-1} x(n) exp(-i ω n)).
+                               (∑{n=0…N-1} y'(n) exp(i ω n)) / N">
+                S_{xy} (\omega) = {1 \over N}
+                \left(\sum_{n=0}^{N-1} x(n)\,e^{-i \omega n}\right)
+                \left( \sum_{n=0}^{N-1} \bar{y}(n)\,e^{i \omega n} \right)
+            </latex>
+        </para>
+        <para>
+            Метод корреляции вычисляет спектральную оценку как преобразование Фурье
+            модифицированной оценки функции авто/кросс-корреляции. Эта модифицированная
+            оценка авто/кросс-корреляции состоит из повторно вычисляемых оценок функции
+            автокорреляции из перекрытия под-сегментов данных, а затем усредняет
+            эти оценки для получения результатов.
+        </para>
+        <para>
+            Количество точек окна равно <literal>2*nlags-1</literal>.
+        </para>
+        <para>
+            Для пакетной обработки данные <varname>x</varname> и <varname>y</varname>
+            могут быть прочитаны сегмент за сегментом с помощью функций
+            <literal>getx</literal> и <literal>gety</literal>, определённых пользователем.
+            Эти функции имеют следующий синтаксис:
+        </para>
+        <para>
+            <literal>xk = getx(ns,offset)</literal> и
+            <literal>yk = gety(ns,offset)</literal> где <varname>ns</varname> - это
+            размер сегмента, и <varname>offset</varname> - это индекс первого элемента
+            сегмента в полном сигнале.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Предупреждение</title>
+        <para>
+            Для версии Scilab до 5.0.2 возвращаемое значение было модулем текущего значения.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Сcылка</title>
+        <para>Oppenheim, A.V., and R.W. Schafer. Discrete-Time Signal Processing,
+            Upper Saddle River, NJ: Prentice-Hall, 1999
+        </para>
+    </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="example"><![CDATA[
+rand('normal');
+rand('seed',0);
+x = rand(1:1024-33+1);
+
+// делаем фильтр нижних частот с помощью eqfir
+[nf, bedge, des, wate] = (33, [0 .1;.125 .5], [1 0], [1 1]);
+h = eqfir(nf, bedge, des, wate);
+
+// фильтруем белые данные для получения цветных данных
+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>Смотрите также</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/ru_RU/spectral_estimation/pspect.xml b/scilab/modules/signal_processing/help/ru_RU/spectral_estimation/pspect.xml
new file mode 100644 (file)
index 0000000..d47a98a
--- /dev/null
@@ -0,0 +1,266 @@
+<?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="ru">
+    <refnamediv>
+        <refname>pspect</refname>
+        <refpurpose>
+            двусторонняя кросс-спектральная оценка между 2 дискретными во времени сигналами, исполmзуя
+            метод усреднения периодограммы Уэлча.
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Синтаксис</title>
+        <synopsis>
+            sm = pspect(sec_step, sec_leng, wtype, x)
+            sm = pspect(sec_step, sec_leng, wtype, x, y)
+            sm = pspect(sec_step, sec_leng, wtype, nx)
+            sm = pspect(sec_step, sec_leng, wtype, nx, ny)
+            [sm, cwp] = pspect(.., wpar)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Аргументы</title>
+        <variablelist>
+            <varlistentry>
+                <term>x</term>
+                <listitem>
+                    <para>вектор, отсчёты во временной области первого сигнала.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>y</term>
+                <listitem>
+                    <para>
+                        вектор, отсчёты во временной области второго сигнала. Если
+                        <varname>y</varname> пропущен, то он предполагается равным
+                        <varname>x</varname> (автокорреляция). Если он имеется в наличии, то он
+                        должен иметь то же количество элементов, что и <varname>x</varname>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>nx</term>
+                <listitem>
+                    <para>
+                        скаляр: количество отсчётов в сигнале <varname>x</varname>.
+                        В этом случае сегменты сигнала <varname>x</varname> загружены
+                        пользовательской функцией с именем <literal>getx</literal> (см. ниже).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>ny</term>
+                <listitem>
+                    <para>
+                        скаляр: количество отсчётов в сигнале <varname>y</varname>.
+                        В этом случае сегменты сигнала <varname>y</varname> загружены
+                        пользовательской функцией с именем <literal>gety</literal> (см. ниже).
+                        Если указан, то <literal>ny</literal> должен быть равен
+                        <literal>nx</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>sec_step</term>
+                <listitem>
+                    <para>
+                        смещение каждого окна данных. Перекрытие <literal>D</literal>
+                        определяется как <literal>sec_leng -sec_step</literal>. Если
+                        <literal>sec_step==sec_leng/2</literal>, то перекрытие составляет
+                        50%.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>sec_leng</term>
+                <listitem>
+                    <para>Количество точек в окне.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>wtype</term>
+                <listitem>
+                    <para>Тип окна</para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>
+                                <literal>'re'</literal>: прямоугольное
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'tr'</literal>: треугольное
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'hm'</literal>: Хэмминга
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'hn'</literal>: Хана
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'kr'</literal>: Кайзера, в этом случае должен
+                                быть указан аргумент <literal>wpar</literal>
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <literal>'ch'</literal>: Чебышева, в этом случае должен
+                                быть указан аргумент <literal>wpar</literal>
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>wpar</term>
+                <listitem>
+                    <para>
+                        необязательный параметр для окон Кайзера и Чебышева:
+                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>
+                                'kr': <literal>wpar</literal> должен быть строго положительным числом
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                'ch': <literal>wpar</literal> должен быть двухэлементным вектором
+                                <literal> [main_lobe_width, side_lobe_height]</literal> где
+                                <literal>0&lt;main_lobe_width&lt;.5</literal> и
+                                <literal>side_lobe_height&gt;0</literal>
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>sm</term>
+                <listitem>
+                    <para>
+                        Двусторонняя оценка спектральной мощности в интервале
+                        <literal>[0,1]</literal> нормированных частот. Это вектор-строка
+                        с <literal>sec_len</literal> элементов. Массив является вещественным
+                        в случае автокорреляции и комплексным в случае кросскорреляции.
+                    </para>
+                    <para>
+                        Соответствующий массив нормированных частот
+                        <literal>linspace(0,1,sec_len)</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>cwp</term>
+                <listitem>
+                    <para>
+                        неопределённый параметр окна Чебышева в случае Чебышевской
+                        оконной обработки, либо пустая матрица.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Описание</title>
+        <para>
+            Вычисляет кросс-спектральную оценку двух сигналов <varname>x</varname>
+            и <varname>y</varname> если указаны оба, и автоспектральную оценку
+            для <varname>x</varname> в противном случае. Спектральная оценка,
+            получена с помощью модифицированного метода периодограммы.
+        </para>
+        <para>
+            Кросс-спектр двух сигналов <varname>x</varname> и  <varname>y</varname>
+            определяется как
+            <latex style="display"
+                alt="S_xy(ω) = (∑{n=0…N-1} x(n) exp(-i ω n)).
+                               (∑{n=0…N-1} y'(n) exp(i ω n)) / N">
+                S_{xy} (\omega) = {1 \over N}
+                \left(\sum_{n=0}^{N-1} x(n)\,e^{-i \omega n}\right)
+                \left( \sum_{n=0}^{N-1} \bar{y}(n)\,e^{i \omega n} \right)
+            </latex>
+        </para>
+        <para>
+            Модифицированный метод периодограммы спектральной оценки повторно оценивает
+            периодограмму взвешеных подсекций данных, содержащихся в <varname>x</varname>
+            и <varname>y</varname>. Эти периодограммы затем вместе усредняются и нормируются
+            соответствующей константой для получения окончательной спектральной оценки. Это
+            процесс усреднения, который уменьшает дисперсию в оценке.
+        </para>
+        <para>
+            Для пакетной обработки данные <varname>x</varname> и <varname>y</varname>
+            могут быть прочитаны сегмент за сегментом с помощью функций
+            <literal>getx</literal> и <literal>gety</literal>, определённых пользователем.
+            Эти функции имеют следующий синтаксис:
+        </para>
+        <para>
+            <literal>xk = getx(ns,offset)</literal> и
+            <literal>yk = gety(ns,offset)</literal> где <varname>ns</varname> - это
+            размер сегмента, и <varname>offset</varname> - это индекс первого элемента
+            сегмента в полном сигнале.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Сcылка</title>
+        <para>Oppenheim, A.V., and R.W. Schafer. Discrete-Time Signal Processing,
+            Upper Saddle River, NJ: Prentice-Hall, 1999
+        </para>
+    </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="example"><![CDATA[
+rand('normal');rand('seed',0);
+x = rand(1:1024-33+1);
+
+// делаем фильтр нижних частот с помощью eqfir
+nf = 33; bedge = [0 .1;.125 .5]; des = [1 0]; wate = [1 1];
+h =eqfir(nf, bedge, des, wate);
+
+// фильтруем белые данные для получения цветных данных
+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));
+
+// строим АЧХ фильтра
+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
+sm = pspect(100,200,'tr',y);
+smsize = max(size(sm));
+fr = (1:smsize) / smsize;
+plot(fr, log(sm),'r');
+rand('unif');
+ ]]></programlisting>
+    </refsection>
+    <refsection role="see also">
+        <title>Смотрите также</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 2ac8bcf..65b90ce 100644 (file)
@@ -20,8 +20,7 @@
           xmlns:scilab="http://www.scilab.org"  xml:id="bessel" xml:lang="en">
     <refnamediv xml:id="besseli">
         <refname>besseli</refname>
-        <refpurpose>Modified Bessel functions of the first kind (I sub
-            alpha).
+        <refpurpose>Modified Bessel functions of the first kind (I<subscript>α</subscript>).
         </refpurpose>
     </refnamediv>
     <refnamediv xml:id="besselj">
index 61a78b6..0884f69 100644 (file)
  *
  -->
 <!--  module: signal_processing  -->
-<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="delip" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="delip" xml:lang="en">
     <refnamediv>
         <refname>delip</refname>
         <refpurpose>complete and incomplete elliptic integral of first
@@ -23,7 +26,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[r]=delip(x,ck)</synopsis>
+        <synopsis>r = delip(x, ck)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
     </refsection>
     <refsection>
         <title>Description</title>
-        <para>The elliptic integral of the first kind with parameter
-            <literal>ck</literal> is defined as follow:
-        </para>
         <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata align="center">
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:munderover>
-                                        <mml:mo mml:stretchy="false">∫</mml:mo>
-                                        <mml:mn>0</mml:mn>
-                                        <mml:mi>x</mml:mi>
-                                    </mml:munderover>
-                                    <mml:mfrac>
-                                        <mml:mi mml:fontstyle="italic">dt</mml:mi>
-                                        <mml:msqrt>
-                                            <mml:mrow>
-                                                <mml:mrow>
-                                                    <mml:mo mml:stretchy="false">(</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mn>1</mml:mn>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </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:mn>1</mml:mn>
-                                                            <mml:mo mml:stretchy="false">−</mml:mo>
-                                                            <mml:msubsup>
-                                                                <mml:mi>c</mml:mi>
-                                                                <mml:mi>k</mml:mi>
-                                                                <mml:mn>2</mml:mn>
-                                                            </mml:msubsup>
-                                                        </mml:mrow>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </mml:msup>
-                                                    </mml:mrow>
-                                                    <mml:mo mml:stretchy="false">)</mml:mo>
-                                                </mml:mrow>
-                                            </mml:mrow>
-                                        </mml:msqrt>
-                                    </mml:mfrac>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0">int from{0} to{x} {{dt} over sqrt{
-                                    (1-t^2)(1-c_k^2 t^2)}}
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
+            The elliptic integral of the first kind with parameter
+            <literal>ck</literal> is defined as follow:
+            <latex style="display" alt="integral_0^x dt / sqrt((1 - t^2)(1 - c_k^2 t^2))">
+                \int_0^x {dt \over {\sqrt{(1-t^2)(1-c_k^2\;t^2)}}
+            </latex>
         </para>
         <para>
             Where <literal>x</literal> is real and positive,
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-ck=0.5;
-delip([1,2],ck)
+delip([1,2], 0.5)
 deff('y=f(t)','y=1/sqrt((1-t^2)*(1-ck^2*t^2))')
-intg(0,1,f)    //OK since real solution!
+intg(0, 1, f)    // OK since real solution!
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 36856d8..7f31353 100644 (file)
@@ -9,7 +9,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>[r]=delip(x,ck)</synopsis>
+        <synopsis>r = delip(x, ck)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
         <title>Description</title>
         <para>L'integrale élliptique du premier type pour le paramètre
             <literal>ck</literal> est définie par:
-        </para>
-        <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata>
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:munderover>
-                                        <mml:mo mml:stretchy="false">∫</mml:mo>
-                                        <mml:mn>0</mml:mn>
-                                        <mml:mi>x</mml:mi>
-                                    </mml:munderover>
-                                    <mml:mfrac>
-                                        <mml:mi mml:fontstyle="italic">dt</mml:mi>
-                                        <mml:msqrt>
-                                            <mml:mrow>
-                                                <mml:mrow>
-                                                    <mml:mo mml:stretchy="false">(</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mn>1</mml:mn>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </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:mn>1</mml:mn>
-                                                            <mml:mo mml:stretchy="false">−</mml:mo>
-                                                            <mml:msubsup>
-                                                                <mml:mi>c</mml:mi>
-                                                                <mml:mi>k</mml:mi>
-                                                                <mml:mn>2</mml:mn>
-                                                            </mml:msubsup>
-                                                        </mml:mrow>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </mml:msup>
-                                                    </mml:mrow>
-                                                    <mml:mo mml:stretchy="false">)</mml:mo>
-                                                </mml:mrow>
-                                            </mml:mrow>
-                                        </mml:msqrt>
-                                    </mml:mfrac>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0">int from{0} to{x} {{dt} over sqrt{
-                                    (1-t^2)(1-c_k^2 t^2)}}
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
+            <latex style="display" alt="integral_0^x dt / sqrt((1 - t^2)(1 - c_k^2 t^2))">
+                \int_0^x {dt \over {\sqrt{(1-t^2)(1-c_k^2\;t^2)}}
+            </latex>
         </para>
         <para>
             Où <literal>x</literal> est réel et positif,<literal>ck</literal>
     <refsection>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-ck=0.5;
-delip([1,2],ck)
+delip([1,2], 0.5)
 deff('y=f(t)','y=1/sqrt((1-t^2)*(1-ck^2*t^2))')
-intg(0,1,f)    // OK puisque la solution est réelle !
+intg(0, 1, f)    // OK puisque la solution est réelle !
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 9de7922..94e9b40 100644 (file)
  *
  -->
 <!--  module: signal_processing  -->
-<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="delip" 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: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="delip" xml:lang="ja">
     <refnamediv>
         <refname>delip</refname>
         <refpurpose>
@@ -23,7 +26,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>[r]=delip(x,ck)</synopsis>
+        <synopsis>r = delip(x, ck)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>パラメータ</title>
         <para>
             引数<literal>ck</literal>の
             第一種の楕円積分は以下のように定義されます:
-        </para>
-        <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata align="center">
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:munderover>
-                                        <mml:mo mml:stretchy="false">∫</mml:mo>
-                                        <mml:mn>0</mml:mn>
-                                        <mml:mi>x</mml:mi>
-                                    </mml:munderover>
-                                    <mml:mfrac>
-                                        <mml:mi mml:fontstyle="italic">dt</mml:mi>
-                                        <mml:msqrt>
-                                            <mml:mrow>
-                                                <mml:mrow>
-                                                    <mml:mo mml:stretchy="false">(</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mn>1</mml:mn>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </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:mn>1</mml:mn>
-                                                            <mml:mo mml:stretchy="false">−</mml:mo>
-                                                            <mml:msubsup>
-                                                                <mml:mi>c</mml:mi>
-                                                                <mml:mi>k</mml:mi>
-                                                                <mml:mn>2</mml:mn>
-                                                            </mml:msubsup>
-                                                        </mml:mrow>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </mml:msup>
-                                                    </mml:mrow>
-                                                    <mml:mo mml:stretchy="false">)</mml:mo>
-                                                </mml:mrow>
-                                            </mml:mrow>
-                                        </mml:msqrt>
-                                    </mml:mfrac>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0">int from{0} to{x} {{dt} over sqrt{
-                                    (1-t^2)(1-c_k^2 t^2)}}
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
+            <latex style="display" alt="integral_0^x dt / sqrt((1 - t^2)(1 - c_k^2 t^2))">
+                \int_0^x {dt \over {\sqrt{(1-t^2)(1-c_k^2\;t^2)}}
+            </latex>
         </para>
         <para>
             ただし, <literal>x</literal> は実数および正で,
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-ck=0.5;
-delip([1,2],ck)
+delip([1,2], 0.5)
 deff('y=f(t)','y=1/sqrt((1-t^2)*(1-ck^2*t^2))')
-intg(0,1,f)    //OK since real solution!
+intg(0, 1, f)    // OK since real solution!
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 3de9bd3..bb65586 100644 (file)
  *
  -->
 <!--  module: signal_processing  -->
-<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="delip" 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="delip" xml:lang="pt">
     <refnamediv>
         <refname>delip</refname>
         <refpurpose>Integral elíptica</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>[r]=delip(x,ck)</synopsis>
+        <synopsis>r = delip(x, ck)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
         <title>Descrição</title>
         <para>A integral elíptica de primeira espécie com parâmetro
             <literal>ck</literal> definido como segue:
-        </para>
-        <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata>
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:munderover>
-                                        <mml:mo mml:stretchy="false">∫</mml:mo>
-                                        <mml:mn>0</mml:mn>
-                                        <mml:mi>x</mml:mi>
-                                    </mml:munderover>
-                                    <mml:mfrac>
-                                        <mml:mi mml:fontstyle="italic">dt</mml:mi>
-                                        <mml:msqrt>
-                                            <mml:mrow>
-                                                <mml:mrow>
-                                                    <mml:mo mml:stretchy="false">(</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mn>1</mml:mn>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </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:mn>1</mml:mn>
-                                                            <mml:mo mml:stretchy="false">−</mml:mo>
-                                                            <mml:msubsup>
-                                                                <mml:mi>c</mml:mi>
-                                                                <mml:mi>k</mml:mi>
-                                                                <mml:mn>2</mml:mn>
-                                                            </mml:msubsup>
-                                                        </mml:mrow>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </mml:msup>
-                                                    </mml:mrow>
-                                                    <mml:mo mml:stretchy="false">)</mml:mo>
-                                                </mml:mrow>
-                                            </mml:mrow>
-                                        </mml:msqrt>
-                                    </mml:mfrac>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0">int from{0} to{x} {{dt} over sqrt{
-                                    (1-t^2)(1-c_k^2 t^2)}}
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
+            <latex style="display" alt="integral_0^x dt / sqrt((1 - t^2)(1 - c_k^2 t^2))">
+                \int_0^x {dt \over {\sqrt{(1-t^2)(1-c_k^2\;t^2)}}
+            </latex>
         </para>
         <para>
             Onde <literal>x</literal> é real e positivo e <literal>ck</literal>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-ck=0.5;
-delip([1,2],ck)
+delip([1,2], 0.5)
 deff('y=f(t)','y=1/sqrt((1-t^2)*(1-ck^2*t^2))')
-intg(0,1,f)    //OK, desde que a solução seja real!
+intg(0, 1, f)    // OK, desde que a solução seja real!
  ]]></programlisting>
     </refsection>
     <refsection>
index aac7a82..4bf0ff2 100644 (file)
  *
  -->
 <!--  module: signal_processing  -->
-<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="delip" xml:lang="ru">
+<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="delip" xml:lang="ru">
     <refnamediv>
         <refname>delip</refname>
         <refpurpose>полный и неполный эллиптический интеграл первого рода</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>[r]=delip(x,ck)</synopsis>
+        <synopsis>r = delip(x, ck)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
@@ -29,7 +32,9 @@
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>вещественный вектор/матрица с неотрицательными элементами real vector with non negative elements</para>
+                    <para>
+                        вещественный вектор/матрица с неотрицательными элементами.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
         <para>
             Эллиптический интеграл первого рода с параметром <literal>ck</literal>
             определяется как:
-        </para>
-        <para>
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata align="center">
-                        <mml:math>
-                            <mml:semantics>
-                                <mml:mrow>
-                                    <mml:munderover>
-                                        <mml:mo mml:stretchy="false">∫</mml:mo>
-                                        <mml:mn>0</mml:mn>
-                                        <mml:mi>x</mml:mi>
-                                    </mml:munderover>
-                                    <mml:mfrac>
-                                        <mml:mi mml:fontstyle="italic">dt</mml:mi>
-                                        <mml:msqrt>
-                                            <mml:mrow>
-                                                <mml:mrow>
-                                                    <mml:mo mml:stretchy="false">(</mml:mo>
-                                                    <mml:mrow>
-                                                        <mml:mn>1</mml:mn>
-                                                        <mml:mo mml:stretchy="false">−</mml:mo>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </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:mn>1</mml:mn>
-                                                            <mml:mo mml:stretchy="false">−</mml:mo>
-                                                            <mml:msubsup>
-                                                                <mml:mi>c</mml:mi>
-                                                                <mml:mi>k</mml:mi>
-                                                                <mml:mn>2</mml:mn>
-                                                            </mml:msubsup>
-                                                        </mml:mrow>
-                                                        <mml:msup>
-                                                            <mml:mi>t</mml:mi>
-                                                            <mml:mn>2</mml:mn>
-                                                        </mml:msup>
-                                                    </mml:mrow>
-                                                    <mml:mo mml:stretchy="false">)</mml:mo>
-                                                </mml:mrow>
-                                            </mml:mrow>
-                                        </mml:msqrt>
-                                    </mml:mfrac>
-                                </mml:mrow>
-                                <mml:annotation mml:encoding="StarMath 5.0">int from{0} to{x} {{dt} over sqrt{
-                                    (1-t^2)(1-c_k^2 t^2)}}
-                                </mml:annotation>
-                            </mml:semantics>
-                        </mml:math>
-                    </imagedata>
-                </imageobject>
-            </inlinemediaobject>
+            <latex style="display" alt="integral_0^x dt / sqrt((1 - t^2)(1 - c_k^2 t^2))">
+                \int_0^x {dt \over {\sqrt{(1-t^2)(1-c_k^2\;t^2)}}
+            </latex>
         </para>
         <para>
             Где <literal>x</literal> - вещественное положительное число,
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-ck=0.5;
-delip([1,2],ck)
-deff('y=f(t)','y=1/sqrt((1-t^2)*(1-ck^2*t^2))')
-intg(0,1,f)    //OK так как решение вещественное!
+delip([1,2], 0.5)
+deff('y=f(t)','y = 1 / sqrt((1-t^2)*(1-ck^2*t^2))')
+intg(0, 1, f)    // OK так как решение вещественное!
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 2052309..5403582 100644 (file)
Binary files a/scilab/modules/string/help/images/prettyprint_LaTeX_MathJax.png and b/scilab/modules/string/help/images/prettyprint_LaTeX_MathJax.png differ
index a967682..5d67c02 100644 (file)
@@ -83,7 +83,7 @@
                     <emphasis role="bold">Number of output ports or vector of sizes</emphasis>
                 </para>
                 <para>
-                    positive integer less than or equal to <literal>8</literal>.
+                    positive integer in [2, 31].
                 </para>
                 <para> Properties : Type 'vec' of size -1</para>
             </listitem>
index 8808d63..349548a 100644 (file)
@@ -81,7 +81,7 @@
                 <para>
                     <emphasis role="bold">Number of input ports or vector of sizes</emphasis>
                 </para>
-                <para> integer greater than or equal to 1 and less than 8.</para>
+                <para> integer in [1, 31].</para>
                 <para> Properties : Type 'vec' of size -1.</para>
             </listitem>
         </itemizedlist>