[doc] misc. typos, small fixes & improvements 38/21138/14
Samuel GOUGEON [Mon, 25 Nov 2019 01:53:37 +0000 (02:53 +0100)]
 * %k: m was wrongly restricted to R+. integral definition was missing.
 * bitget: an example simplified
 * freson: discrete: <programlisting> did not match <scilab:image>
 * optim_sa: alone in its section => moved in ../
 * http_upload had a wrong refname
 * warning: translated versions were not up-to-date:
    http://bugzilla.scilab.org/16265

Change-Id: Idfcbfa995158edb5af780d94a90cb3f91a462e60

23 files changed:
scilab/CHANGES.md
scilab/modules/cacsd/help/en_US/linear_analysis/freq_domain/freson.xml
scilab/modules/cacsd/help/ja_JP/linear_analysis/freq_domain/freson.xml
scilab/modules/call_scilab/help/en_US/fromc.xml
scilab/modules/core/help/en_US/error_handling/warning.xml
scilab/modules/core/help/fr_FR/error_handling/warning.xml
scilab/modules/core/help/ja_JP/error_handling/warning.xml
scilab/modules/core/help/pt_BR/error_handling/warning.xml
scilab/modules/core/help/ru_RU/error_handling/warning.xml
scilab/modules/elementary_functions/help/en_US/bitwise/bitget.xml
scilab/modules/elementary_functions/help/ru_RU/bitwise/bitget.xml
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/_LaTeX_percentk.xml_1.png [new file with mode: 0644]
scilab/modules/helptools/images/freson_1.png [deleted file]
scilab/modules/helptools/images/freson_ja_JP_1.png [new file with mode: 0644]
scilab/modules/helptools/images/freson_ja_JP_2.png [new file with mode: 0644]
scilab/modules/m2sci/help/en_US/m2sci_equivalents/r/reshape.xml
scilab/modules/simulated_annealing/help/en_US/algorithms/CHAPTER [deleted file]
scilab/modules/simulated_annealing/help/en_US/optim_sa.xml [moved from scilab/modules/simulated_annealing/help/en_US/algorithms/optim_sa.xml with 100% similarity]
scilab/modules/special_functions/help/en_US/percentk.xml
scilab/modules/special_functions/help/ja_JP/percentk.xml
scilab/modules/special_functions/help/ru_RU/percentk.xml [new file with mode: 0644]
scilab/modules/webtools/help/en_US/http_upload.xml

index 96191d5..63bb1b4 100644 (file)
@@ -206,10 +206,12 @@ Bug Fixes
 * [#16174](http://bugzilla.scilab.org/show_bug.cgi?id=16174): `libraryinfo` yielded 0x0 matrix of strings for libs without macro
 * [#16208](http://bugzilla.scilab.org/show_bug.cgi?id=16208): Using 3D string matrix with old C-api gateways may crash Scilab.
 * [#16209](http://bugzilla.scilab.org/show_bug.cgi?id=16209): grand() causes a freeze after several consecutive calls when using default base generator.
+* [#16210](http://bugzilla.scilab.org/show_bug.cgi?id=16210): The uicontrol.units = "normalized" property was not described.
 * [#16242](http://bugzilla.scilab.org/show_bug.cgi?id=16242): `loadmatfile()` could not read Octave native text data files.
 * [#16257](http://bugzilla.scilab.org/show_bug.cgi?id=16257): `blockdiag()` implemented to replace `sysdiag()`, improved and extended to strings.
 * [#16263](http://bugzilla.scilab.org/show_bug.cgi?id=16263): Polynomial insertion was broken for complex case.
 * [#16264](http://bugzilla.scilab.org/show_bug.cgi?id=16264): After empty for loop iterator was left uninitialized.
+* [#16265](http://bugzilla.scilab.org/show_bug.cgi?id=16265): The translated pages of the `warning` documentation were not up-to-date.
 * [#16271](http://bugzilla.scilab.org/show_bug.cgi?id=16271): `loadmatfile()` was never able to automatically detect the input data format.
 * [#16272](http://bugzilla.scilab.org/show_bug.cgi?id=16272): `spzeros(0,n)` and `spzeros(n,0)` were different from `sparse(0,0)`.
 * [#16275](http://bugzilla.scilab.org/show_bug.cgi?id=16275): `fsolve(x0, fun, tol)` no longer took `tol` into account.
index 62afc0d..25e0f72 100644 (file)
         <title>Examples</title>
         <para>Continuous time system</para>
         <programlisting role="example"><![CDATA[
-h=syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
-fr=freson(h)
-clf;bode(h);
+h = syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
+fr = freson(h)
+clf
+bode(h);
 fig=gcf();sca(fig.children(2));
-[phi,db]=phasemag(repfreq(h,fr));
+[phi,db] = phasemag(repfreq(h,fr));
 plot(fr,db(:),'+r')
 ]]></programlisting>
         <scilab:image localized="true">
@@ -71,13 +72,14 @@ plot(fr,db(:),'+r')
         </scilab:image>
         <para>Discrete time system</para>
         <programlisting role="example"><![CDATA[
-hd=dscr(h,0.01)
-fr=freson(hd)
-clf;bode(hd);
+h = syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
+hd = dscr(h, 0.05);
+fr = freson(hd)
+clf
+bode(hd);
 fig=gcf();sca(fig.children(2));
-[phi,db]=phasemag(repfreq(hd,fr));
+[phi,db] = phasemag(repfreq(hd,fr));
 plot(fr,db(:),'+r');
-
  ]]></programlisting>
         <scilab:image localized="true">
             h=syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
index cc6add9..91d91c5 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="ja" xml:id="freson">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ja" xml:id="freson">
     <refnamediv>
         <refname>freson</refname>
         <refpurpose>ピーク周波数</refpurpose>
     </refsection>
     <refsection>
         <title>例</title>
+        <para>Continuous time system</para>
         <programlisting role="example"><![CDATA[
-h=syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2))
-fr=freson(h)
-bode(h)
-g=20*log(abs(repfreq(h,fr)))/log(10)
- ]]></programlisting>
-        <scilab:image>
-            h=syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2))
+h = syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
+fr = freson(h)
+clf
+bode(h);
+fig=gcf();sca(fig.children(2));
+[phi,db] = phasemag(repfreq(h,fr));
+plot(fr,db(:),'+r')
+]]></programlisting>
+        <scilab:image localized="true">
+            h=syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
             fr=freson(h)
-            bode(h)
-            g=20*log(abs(repfreq(h,fr)))/log(10)
+            clf;bode(h);
+            fig=gcf();sca(fig.children(2));
+            [phi,db]=phasemag(repfreq(h,fr));
+            plot(fr,db(:),'+r');
+        </scilab:image>
+        <para>Discrete time system</para>
+        <programlisting role="example"><![CDATA[
+h = syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
+hd = dscr(h, 0.05);
+fr = freson(hd)
+clf
+bode(hd);
+fig=gcf();sca(fig.children(2));
+[phi,db] = phasemag(repfreq(hd,fr));
+plot(fr,db(:),'+r');
+ ]]></programlisting>
+        <scilab:image localized="true">
+            h=syslin('c',-1+%s,(3+2*%s+%s^2)*(50+0.1*%s+%s^2));
+            hd=dscr(h,0.05);
+            fr=freson(hd);
+            clf;bode(hd);
+            fig=gcf();sca(fig.children(2));
+            [phi,db]=phasemag(repfreq(hd,fr));
+            plot(fr,db(:),'+r');
         </scilab:image>
     </refsection>
     <refsection role="see also">
@@ -77,4 +106,17 @@ g=20*log(abs(repfreq(h,fr)))/log(10)
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                    <para>handling discrete systems and zpk
+                        representation, peak detection improved.
+                    </para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 90b0ca1..403454f 100644 (file)
     <refsection>
         <title>Description</title>
         <para>
-            Returns <literal>%t</literal>Checks if current Scilab is called from an external C program or <literal>%f</literal> if not.
+            Returns <literal>%t</literal> if the current Scilab session is opened from an external
+            C program, or <literal>%f</literal> if not.
         </para>
     </refsection>
 
     <refsection>
         <title>Example</title>
         <programlisting role="example"><![CDATA[
-fromc();
+fromc()
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index b263b24..41110a0 100644 (file)
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="warning">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="warning">
     <refnamediv>
         <refname>warning</refname>
         <refpurpose>warning messages</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>warning('string')
+        <synopsis>
+            warning('string')
             warning(string_matrix)
             warning('off')
             warning('on')
             <literal>'string'</literal> in a warning message.
         </para>
         <para>
-            <literal>warning(string_matrix)</literal> prints each element of the matrix <literal>string_matrix</literal>
-            in a warning message.
+            <literal>warning(string_matrix)</literal> prints each element of the matrix
+            <literal>string_matrix</literal> in a warning message.
         </para>
         <para>
-            <literal>'on'</literal> enables warning messages, warning messages do not interrupt script execution.
+            <literal>'on'</literal> enables warning messages.
+           Warning messages do not interrupt script execution.
         </para>
         <para>
             <literal>'off'</literal> disables warning messages, warning messages are ignored (neither displayed nor interrupting script execution).
         </para>
         <para>
-            <literal>'stop'</literal> enables warning messages and stops execution when a warning is encountered.
+            <literal>'stop'</literal> enables warning messages and stops execution when a warning
+            is encountered.
         </para>
         <para>
             <literal>'query'</literal> gets state <literal>'on'</literal>, <literal>'off'</literal> or <literal>'stop'</literal>.
         </para>
         <para>
-            <literal>warning("on")</literal>, <literal>warning("off")</literal> and <literal>warning("stop")</literal> also affect hard-coded functions issuing warnings.
+            <literal>warning("on")</literal>, <literal>warning("off")</literal> and
+            <literal>warning("stop")</literal> also affect hard-coded functions issuing warnings.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-w_flag = warning("query"); // remembering the warning flag
+warning_prev = warning("query"); // remembering the initial warning status
 
 warning('on')
 warning('this is a warning')
@@ -63,7 +70,7 @@ catch
     lasterror() // Warning message is considered an error
 end
 
-warning(w_flag); // resetting the warning flag
+warning(warning_prev); // restoring the initial warning status
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
@@ -83,4 +90,15 @@ warning(w_flag); // resetting the warning flag
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revremark>
+                    <literal>"stop"</literal> option added.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 5890818..3ce625b 100644 (file)
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="warning">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="fr" xml:id="warning">
     <refnamediv>
         <refname>warning</refname>
-        <refpurpose>Messages d'avertissement à l'attention des utilisateurs</refpurpose>
+        <refpurpose>Affichage des messages d'avertissement à l'attention des utilisateurs</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>warning('string')</literal> affiche le message
+            <literal>warning('string')</literal> affiche dans la console le message
             <literal>'string'</literal> comme avertissement à l'utilisateur.
         </para>
         <para>
-            <literal>warning(string_matrix)</literal> affiche chaque élément de <literal>string_matrix</literal>
-            comme avertissement à l'utilisateur.
+            <literal>warning(string_matrix)</literal> affiche chaque élément de
+            <literal>string_matrix</literal>.
         </para>
         <para>
-            <literal>'on'</literal> active les messages d'avertissement, l'exécution des scripts n'est pas interrompue après affichage d'un message d'avertissement.
+            <literal>'on'</literal> active les messages d'avertissement. L'exécution des scripts
+            n'est pas interrompue après affichage d'un message d'avertissement.
         </para>
         <para>
-            <literal>'off'</literal> désactive les messages d'avertissement, les messages d'avertissements sont ignorés (ni affichés ni bloquant l'exécution des scripts).
+            <literal>'off'</literal> désactive les messages d'avertissement. Les messages
+            d'avertissement sont ignorés (ni affichés, ni bloquant l'exécution des scripts).
         </para>
         <para>
-            <literal>'stop'</literal> active les messages d'avertissement et interrompt l'exécution d'un script dès qu'un message d'avertissement est rencontré.
+            <literal>'stop'</literal> active les messages d'avertissement. Si un avertissement
+            est rencontré, le script en cours l'ayant généré sera interrompu.
         </para>
         <para>
-            <literal>'query'</literal> récupère l'état actuel des messages d'avertissement <literal>'on'</literal>, <literal>'off'</literal> ou <literal>'stop'</literal>.
+            <literal>'query'</literal> indique le réglage en cours  pour les messages d'avertissement :
+            <literal>'on'</literal>, <literal>'off'</literal>, ou <literal>'stop'</literal>.
         </para>
         <para>
-            <literal>warning("on")</literal>, <literal>warning("off")</literal> et <literal>warning("stop")</literal> affectent aussi l'affichage des messages d'avertissement pour les fonctions programmées en dur en plus des messages d'avertissement pour les scripts.
+            <literal>warning("on")</literal>, <literal>warning("off")</literal> et
+           <literal>warning("stop")</literal> affectent l'affichage des messages d'avertissement
+           également pour les fonctions programmées en dur, en plus des messages d'avertissement
+           pour les scripts et fonctions en langage Scilab.
         </para>
     </refsection>
     <refsection>
@@ -82,5 +92,16 @@ warning(w_flag); // Repositionnement de l'état des messages d'avertissement
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revremark>
+                    Option <literal>"stop"</literal> ajoutée
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
 
index 5187a02..0b160fc 100644 (file)
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="warning">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ja" xml:id="warning">
     <refnamediv>
         <refname>warning</refname>
         <refpurpose>警告メッセージ</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼出し手順</title>
-        <synopsis>warning('string')
+        <synopsis>
+            warning('string')
+            warning(string_matrix)
             warning('off')
             warning('on')
+            warning('stop')
             mode = warning('query')
         </synopsis>
     </refsynopsisdiv>
             警告メッセージとして文字列<literal>'string'</literal>を表示します.
         </para>
         <para>
+            <literal>warning(string_matrix)</literal> prints each element of the matrix
+            <literal>string_matrix</literal> in a warning message.
+        </para>
+        <para>
             <literal>'on'</literal> は警告メッセージを有効にします.
         </para>
         <para>
             <literal>'off'</literal> は警告メッセージを無効にします.
         </para>
         <para>
+            <literal>'stop'</literal> enables warning messages and stops execution when a
+            warning is encountered.
+        </para>
+        <para>
             <literal>'query'</literal> は, <literal>'on'</literal> または
             <literal>'off'</literal> の状態を取得します.
         </para>
+        <para>
+            <literal>warning("on")</literal>, <literal>warning("off")</literal> and
+            <literal>warning("stop")</literal> also affect hard-coded functions issuing warnings.
+        </para>
     </refsection>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
+warning_prev = warning("query"); // remembering the initial warning status
+
 warning('on')
 warning('this is a warning')
 warning('off')
@@ -39,6 +59,17 @@ warning('query')
 warning('on')
 // Example with a localized message
 warning(msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"),"myFunction",2));
+
+// Setting warning stop
+warning("stop")
+
+try
+    warning("this is a warning");
+catch
+    lasterror() // Warning message is considered an error
+end
+
+warning(warning_prev); // restoring the initial warning status
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
@@ -58,4 +89,15 @@ warning(msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"),"
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revremark>
+                    <literal>"stop"</literal> option added.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 82ae218..dffbe9a 100644 (file)
@@ -1,25 +1,35 @@
 <?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: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="warning" 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="warning" xml:lang="pt">
     <refnamediv>
         <refname>warning</refname>
         <refpurpose>mensagens de aviso</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>warning('string')
+        <synopsis>
+            warning('string')
+            warning(string_matrix)
             warning('off')
             warning('on')
+            warning('stop')
             mode = warning('query')
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Descrição</title>
         <para>
-            Imprime o string <literal>'string'</literal> em uma mensagem de
-            aviso
+            Imprime o string <literal>'string'</literal> em uma mensagem de aviso
+        </para>
+        <para>
+            <literal>warning(string_matrix)</literal> prints each element of the matrix
+            <literal>string_matrix</literal> in a warning message.
         </para>
         <para>
             <literal>'on'</literal> habilita mensagens de aviso.
+            Warning messages do not interrupt script execution.
         </para>
         <para>
             <literal>'off'</literal> desabilita mensagens de aviso.
         <para>
             <literal>'query'</literal> retorna o estado <literal>'on'</literal> ou <literal>'off'</literal>.
         </para>
+        <para>
+            <literal>warning("on")</literal>, <literal>warning("off")</literal> and
+            <literal>warning("stop")</literal> also affect hard-coded functions issuing warnings.
+        </para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
+warning_prev = warning("query"); // remembering the initial warning status
+
 warning('on')
 warning('este é um aviso')
 warning('off')
@@ -39,6 +55,17 @@ warning('query')
 warning('on')
 // Example with a localized message
 warning(msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"),"myFunction",2));
+
+// Setting warning stop
+warning("stop")
+
+try
+    warning("this is a warning");
+catch
+    lasterror() // Warning message is considered an error
+end
+
+warning(warning_prev); // restoring the initial warning status
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
@@ -58,4 +85,15 @@ warning(msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"),"
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revremark>
+                    <literal>"stop"</literal> option added.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index aa57db4..fcf118a 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="warning">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ru" xml:id="warning">
     <refnamediv>
         <refname>warning</refname>
         <refpurpose>предупреждающие сообщения</refpurpose>
         <title>Синтаксис</title>
         <synopsis>
             warning('string')
+            warning(string_matrix)
             warning('off')
             warning('on')
+            warning('stop')
             mode = warning('query')
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Описание</title>
         <para>
-            <literal>warning('string')</literal> печатает символьную строку  <literal>'string'</literal> в предупреждающем сообщении.
+            <literal>warning('string')</literal> печатает символьную строку
+            <literal>'string'</literal> в предупреждающем сообщении.
         </para>
         <para>
-            <literal>'on'</literal> -- включение предупреждающих сообщений.
+            <literal>warning(string_matrix)</literal> печатает каждый элемент матрицы
+            <literal>string_matrix</literal> в предупреждающем сообщении.
         </para>
         <para>
-            <literal>'off'</literal> -- отключение предупреждающих сообщений.
+            <literal>'on'</literal> - включение предупреждающих сообщений.
         </para>
         <para>
-            <literal>'query'</literal> -- получение состояния: <literal>'on'</literal> или <literal>'off'</literal>.
+            <literal>'off'</literal> - отключение предупреждающих сообщений.
+        </para>
+        <para>
+            <literal>'stop'</literal> включает предупреждающие сообщения и останавливает исполнение,
+            когда возникает предупреждение.
+        </para>
+        <para>
+            <literal>'query'</literal> - получение состояния: <literal>'on'</literal> или
+            <literal>'off'</literal>.
+        </para>
+        <para>
+            <literal>warning("on")</literal>, <literal>warning("off")</literal> и
+            <literal>warning("stop")</literal> также влияют на предупреждения о проблемах в жёстко
+             запрограммированных функциях.
         </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
+warning_prev = warning("query"); // запомним исходный сататус предупреждений
+
 warning('on')
-warning('это -- предупреждение')
+warning('это - предупреждение')
 warning('off')
-warning('это -- предупреждение')
+warning('это - предупреждение')
 warning('query')
 warning('on')
 // Пример с локализованным сообщением
 warning(msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"),"myFunction",2));
+
+// Установка остановки на предупреждении
+warning("stop")
+
+try
+    warning("это предупреждение");
+catch
+    lasterror() // Предупреждающее сообщение считается ошибкой
+end
+
+warning(warning_prev); // восстановление исходного статуса предупреждений
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
@@ -58,4 +91,15 @@ warning(msprintf(gettext("%s: Wrong number of input argument: %d expected.\n"),"
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revremark>
+                    Добавлена опция <literal>"stop"</literal>.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index c0dc13a..d62a102 100644 (file)
@@ -193,18 +193,13 @@ bitget(x,    [7 16 18 19 35 52 70 80])
         <emphasis role="bold">x and pos are arrays with mismatching sizes:</emphasis>
         </para>
         <programlisting role="example"><![CDATA[
-x = [39  8  4  44  52  5  6  14  64 39  12  4  62  29  12  50  39  29];
-x = matrix(x,2,3,3);
-// (:,:,1)
-//   39.   4.    52.
-//   8.    44.   5.
-// (:,:,2)
-//   6.    64.   12.
-//   14.   39.   4.
-// (:,:,3)
-//   62.   12.   39.
-//   29.   50.   29.
-x = sum(2.^(x-1),3);
+x = [ 39  6   62
+      8   14  29
+      4   64  12
+      44  39  50
+      52  12  39
+      5   4   29 ];
+x = sum(2.^(x-1),2);
 bitget(x, [5 8 12 39])
    ]]></programlisting>
    <screen><![CDATA[
index 217b1a0..dfc081a 100644 (file)
@@ -192,18 +192,13 @@ bitget(x,    [7 16 18 19 35 52 70 80])
         <emphasis role="bold">x и pos являются массивами несовпадающих размеров:</emphasis>
         </para>
         <programlisting role="example"><![CDATA[
-x = [39  8  4  44  52  5  6  14  64 39  12  4  62  29  12  50  39  29];
-x = matrix(x,2,3,3);
-// (:,:,1)
-//   39.   4.    52.
-//   8.    44.   5.
-// (:,:,2)
-//   6.    64.   12.
-//   14.   39.   4.
-// (:,:,3)
-//   62.   12.   39.
-//   29.   50.   29.
-x = sum(2.^(x-1),3);
+x = [ 39  6   62
+      8   14  29
+      4   64  12
+      44  39  50
+      52  12  39
+      5   4   29 ];
+x = sum(2.^(x-1),2);
 bitget(x, [5 8 12 39])
    ]]></programlisting>
    <screen><![CDATA[
index f2d945b..ecf35ce 100644 (file)
@@ -386,6 +386,7 @@ _LaTeX_ode.xml_1.png=84ae2f6a526a30f59b67ce587fcd28c9
 _LaTeX_pack.xml_1.png=44e43279e4a6173003d2e27d996c92e5\r
 _LaTeX_percente.xml_1.png=d35411f104304697e6fd27751ab66fc5\r
 _LaTeX_percente.xml_2.png=3be181064c31bd09ccf0caddf10b3e85\r
+_LaTeX_percentk.xml_1.png=3f3bd79cf1cdbfb65e3b968410acb779\r
 _LaTeX_percentpi.xml_1.png=4f08e3dba63dc6d40b22952c7a9dac6d\r
 _LaTeX_prod.xml_1.png=05a314d76d3342cb017a069e00be89bc\r
 _LaTeX_prod.xml_2.png=36e17bceced31cceba9ae0745b814988\r
@@ -668,11 +669,12 @@ fplot3d_1.png=ba85d76348d2aba0b986191799831e93
 frep2tf_1.png=01f1811ca1a61c96cc1dbf0304f244da\r
 frep2tf_2.png=d9f09f1ea92f2c9a95fd2e4099c4e9a2\r
 freq_div_1.png=d50cf5bef89a6648695807129d746024\r
-freson_1.png=5c5e94077fc1d13f9ca4655b34692d20\r
 freson_en_US_1.png=ae3a8393f831c9ef5810b765d647e04e\r
 freson_en_US_2.png=0e458e3475681df1b40fe0fc44b06259\r
 freson_fr_FR_1.png=ae3a8393f831c9ef5810b765d647e04e\r
 freson_fr_FR_2.png=0e458e3475681df1b40fe0fc44b06259\r
+freson_ja_JP_1.png=ae3a8393f831c9ef5810b765d647e04e\r
+freson_ja_JP_2.png=0e458e3475681df1b40fe0fc44b06259\r
 freson_pt_BR_1.png=ae3a8393f831c9ef5810b765d647e04e\r
 freson_pt_BR_2.png=0e458e3475681df1b40fe0fc44b06259\r
 freson_ru_RU_1.png=ae3a8393f831c9ef5810b765d647e04e\r
diff --git a/scilab/modules/helptools/images/_LaTeX_percentk.xml_1.png b/scilab/modules/helptools/images/_LaTeX_percentk.xml_1.png
new file mode 100644 (file)
index 0000000..5f639de
Binary files /dev/null and b/scilab/modules/helptools/images/_LaTeX_percentk.xml_1.png differ
diff --git a/scilab/modules/helptools/images/freson_1.png b/scilab/modules/helptools/images/freson_1.png
deleted file mode 100644 (file)
index e80b0b7..0000000
Binary files a/scilab/modules/helptools/images/freson_1.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/freson_ja_JP_1.png b/scilab/modules/helptools/images/freson_ja_JP_1.png
new file mode 100644 (file)
index 0000000..9eedec5
Binary files /dev/null and b/scilab/modules/helptools/images/freson_ja_JP_1.png differ
diff --git a/scilab/modules/helptools/images/freson_ja_JP_2.png b/scilab/modules/helptools/images/freson_ja_JP_2.png
new file mode 100644 (file)
index 0000000..81cc837
Binary files /dev/null and b/scilab/modules/helptools/images/freson_ja_JP_2.png differ
index 89ca036..b3f7a7b 100644 (file)
@@ -51,8 +51,5 @@ matrix
         <para>
             All unspecified dimensions are represented by a <emphasis role="bold">[]</emphasis> input in Matlab while in Scilab they are given by a <emphasis role="bold">-1</emphasis>.
         </para>
-        <para>
-            Matlab <emphasis role="bold">reshape</emphasis> suppresses singleton higher dimension, it is not the case for <emphasis role="bold">matrix</emphasis> in Scilab.
-        </para>
     </refsection>
 </refentry>
diff --git a/scilab/modules/simulated_annealing/help/en_US/algorithms/CHAPTER b/scilab/modules/simulated_annealing/help/en_US/algorithms/CHAPTER
deleted file mode 100644 (file)
index 72bf607..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Algorithms
-
index c0848d5..eb8ba3f 100644 (file)
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="percentk">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="percentk">
     <refnamediv>
         <refname>%k</refname>
-        <refpurpose>Jacobi's complete elliptic integral</refpurpose>
+        <refpurpose>Jacobi's complete elliptic integral of the first kind (vectorized)</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[K]=%k(m)</synopsis>
+        <synopsis>K = %k(m)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
                 <term>m</term>
                 <listitem>
                     <para>
-                        parameter of the elliptic integral <literal>0&lt;m&lt;1</literal> (<literal>m</literal> can be a vector)
+                        vector of real numbers in [-∞,1): parameter of the elliptic integral.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>K</term>
                 <listitem>
-                    <para>value of the elliptic integral from 0 to 1 on the real axis</para>
+                    <para>vector of respective values of the integral.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Description</title>
         <para>
-            Calculates Jacobi's complete elliptic integral
-            of the first kind :
+            Computes and provides values of the Jacobi's complete elliptic integral of the
+            first kind, defined as
+            <latex style="display" alt="K(m) = integral_0^1 {dt / sqrt[(1 - t^2)(1 - m.t^2)]}">K(m)=\int_0^1 \frac{dt}{\sqrt{(1-t^2)(1-m\,t^2)}}</latex>
         </para>
-    </refsection>
-    <refsection>
-        <title>References</title>
         <para>
-            Abramowitz and Stegun page 598
+            <emphasis role="bold">Reference</emphasis> : Abramowitz and Stegun page 598
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-m=0.4;
-delip(1,sqrt(m))
-%k(m)
+m = 0.4;
+[%k(m) delip(1, sqrt(m))]
+%k([-%inf -10 -1 0 0.1 0.3 0.9])
+%k(0)==%pi/2
  ]]></programlisting>
+    <screen><![CDATA[
+--> m = 0.4;
+--> [%k(m) delip(1, sqrt(m))]
+ ans  =
+   1.7775194   1.7775194
+
+--> %k([-%inf -10 -1 0 0.1 0.3 0.9])
+ ans  =
+   0.   0.7908719   1.3110288   1.5707963   1.6124413   1.7138894   2.5780921
+
+--> %k(0)==%pi/2
+ ans  =
+  T
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index f0aa304..4fe457a 100644 (file)
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="percentk">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ja" xml:id="percentk">
     <refnamediv>
         <refname>%k</refname>
         <refpurpose>ヤコビの完全楕円積分</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>[K]=%k(m)</synopsis>
+        <synopsis>K = %k(m)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>パラメータ</title>
                 <term>m</term>
                 <listitem>
                     <para>
-                        楕円積分のパラメータ <literal>0&lt;m&lt;1</literal>
-                        (<literal>m</literal> はベクトルとすることができます)
+                        vector of real numbers in (-∞,1): 楕円積分パラメーター
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>K</term>
                 <listitem>
-                    <para>
-                        実軸上の 0 から 1までの楕円積分の値
-                    </para>
+                    <para>vector of respective values of the integral.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
         <title>説明</title>
         <para>
             ヤコビの第一種完全楕円積分を計算します :
+            <latex style="display" alt="K(m) = integral_0^1 {dt / sqrt[(1 - t^2)(1 - m.t^2)]}">K(m)=\int_0^1 \frac{dt}{\sqrt{(1-t^2)(1-m\,t^2)}}</latex>
         </para>
-    </refsection>
-    <refsection>
-        <title>参考文献</title>
         <para>
-            Abramowitz and Stegun page 598
+            <emphasis role="bold">参考文献</emphasis> : Abramowitz and Stegun page 598
         </para>
     </refsection>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-m=0.4;
-delip(1,sqrt(m))
-%k(m)
+m = 0.4;
+[%k(m) delip(1, sqrt(m))]
+%k([-%inf -10 -1 0 0.1 0.3 0.9])
+%k(0)==%pi/2
  ]]></programlisting>
+    <screen><![CDATA[
+--> m = 0.4;
+--> [%k(m) delip(1, sqrt(m))]
+ ans  =
+   1.7775194   1.7775194
+
+--> %k([-%inf -10 -1 0 0.1 0.3 0.9])
+ ans  =
+   0.   0.7908719   1.3110288   1.5707963   1.6124413   1.7138894   2.5780921
+
+--> %k(0)==%pi/2
+ ans  =
+  T
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
diff --git a/scilab/modules/special_functions/help/ru_RU/percentk.xml b/scilab/modules/special_functions/help/ru_RU/percentk.xml
new file mode 100644 (file)
index 0000000..b004e14
--- /dev/null
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ru" xml:id="percentk">
+    <refnamediv>
+        <refname>%k</refname>
+        <refpurpose>
+            Полный эллиптический интеграл Якоби первого рода (векторизованный)
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Синтаксис</title>
+        <synopsis>K = %k(m)</synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Аргументы</title>
+        <variablelist>
+            <varlistentry>
+                <term>m</term>
+                <listitem>
+                    <para>
+                        вектор вещественных чисел <literal>[-∞,1)</literal>: параметр
+                        эллиптического интеграла.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>K</term>
+                <listitem>
+                    <para>вектор соответствующих значений интеграла.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Описание</title>
+        <para>
+            Вычисляет и выдаёт значения полного эллиптического интеграла Якоби первого рода,
+            определённого как
+            <latex style="display" alt="K(m) = integral_0^1 {dt / sqrt[(1 - t^2)(1 - m.t^2)]}">K(m)=\int_0^1 \frac{dt}{\sqrt{(1-t^2)(1-m\,t^2)}}</latex>
+        </para>
+        <para>
+            <emphasis role="bold">Литература</emphasis> : Abramowitz and Stegun page 598
+        </para>
+    </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="example"><![CDATA[
+m = 0.4;
+[%k(m) delip(1, sqrt(m))]
+%k([-%inf -10 -1 0 0.1 0.3 0.9])
+%k(0)==%pi/2
+ ]]></programlisting>
+    <screen><![CDATA[
+--> m = 0.4;
+--> [%k(m) delip(1, sqrt(m))]
+ ans  =
+   1.7775194   1.7775194
+
+--> %k([-%inf -10 -1 0 0.1 0.3 0.9])
+ ans  =
+   0.   0.7908719   1.3110288   1.5707963   1.6124413   1.7138894   2.5780921
+
+--> %k(0)==%pi/2
+ ans  =
+  T
+]]></screen>
+    </refsection>
+    <refsection role="see also">
+        <title>Смотрите также</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="delip">delip</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>
index 3dfcc27..e39c302 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:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="http_upload">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="http_upload">
     <refnamediv>
-        <refname>http_post</refname>
+        <refname>http_upload</refname>
         <refpurpose>
             HTTP POST or PUT request to upload file(s) on server.
         </refpurpose>