[doc] misc. fix & small improvements 03/21203/28
Samuel GOUGEON [Thu, 2 Jan 2020 23:40:10 +0000 (00:40 +0100)]
  * while: http://bugzilla.scilab.org/16300

Change-Id: Ide4940125a8246dc4b9789b12c632a90aba71134

43 files changed:
scilab/CHANGES.md
scilab/modules/cacsd/help/en_US/linear_system_representation/zpk2ss.xml
scilab/modules/cacsd/help/en_US/linear_system_representation/zpk2tf.xml
scilab/modules/console/help/en_US/input.xml
scilab/modules/console/help/ja_JP/input.xml
scilab/modules/console/help/ja_JP/tohome.xml
scilab/modules/console/help/pt_BR/input.xml
scilab/modules/console/help/ru_RU/tohome.xml
scilab/modules/core/help/en_US/1_keywords/brackets.xml
scilab/modules/core/help/en_US/2_control_flow/while.xml
scilab/modules/core/help/en_US/configuration/sciargs.xml
scilab/modules/core/help/fr_FR/1_keywords/brackets.xml
scilab/modules/core/help/fr_FR/configuration/sciargs.xml
scilab/modules/core/help/ja_JP/configuration/sciargs.xml
scilab/modules/core/help/pt_BR/configuration/sciargs.xml
scilab/modules/core/help/ru_RU/configuration/sciargs.xml
scilab/modules/dynamic_link/help/en_US/user.xml [moved from scilab/modules/development_tools/help/en_US/user.xml with 100% similarity]
scilab/modules/dynamic_link/help/fr_FR/user.xml [moved from scilab/modules/development_tools/help/fr_FR/user.xml with 100% similarity]
scilab/modules/dynamic_link/help/ja_JP/user.xml [moved from scilab/modules/development_tools/help/ja_JP/user.xml with 100% similarity]
scilab/modules/dynamic_link/help/pt_BR/user.xml [moved from scilab/modules/development_tools/help/pt_BR/user.xml with 100% similarity]
scilab/modules/dynamic_link/help/ru_RU/user.xml [moved from scilab/modules/development_tools/help/ru_RU/user.xml with 100% similarity]
scilab/modules/elementary_functions/help/en_US/bitwise/bitstring.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/empty.xml
scilab/modules/elementary_functions/help/en_US/floating_point/isinf.xml
scilab/modules/elementary_functions/help/en_US/matrixoperations/unwrap.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/ndgrid.xml
scilab/modules/elementary_functions/help/fr_FR/floating_point/isinf.xml
scilab/modules/elementary_functions/help/ja_JP/matrixoperations/unwrap.xml
scilab/modules/elementary_functions/help/ja_JP/trigonometry/atanh.xml
scilab/modules/elementary_functions/help/ru_RU/bitwise/bitstring.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/empty.xml
scilab/modules/elementary_functions/help/ru_RU/floating_point/isinf.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/fr_FR/handle/get_figure_handle.xml
scilab/modules/graphics/help/pt_BR/axes_operations/axes_properties.xml
scilab/modules/helptools/images/unwrap_2D.png [new file with mode: 0644]
scilab/modules/localization/help/en_US/gettext.xml
scilab/modules/m2sci/help/en_US/m2sci_equivalents/Matlab-Scilab_character_strings.xml [moved from scilab/modules/m2sci/help/en_US/Matlab-Scilab_character_strings.xml with 100% similarity]
scilab/modules/m2sci/help/fr_FR/m2sci_equivalents/Matlab-Scilab_character_strings.xml [moved from scilab/modules/m2sci/help/fr_FR/Matlab-Scilab_character_strings.xml with 100% similarity]
scilab/modules/matio/help/en_US/addchapter.sce
scilab/modules/matio/help/fr_FR/addchapter.sce
scilab/modules/matio/help/pt_BR/addchapter.sce
scilab/modules/statistics/help/ja_JP/3_dispersion_widths/variance.xml [deleted file]

index c4005bd..47b025e 100644 (file)
@@ -400,6 +400,7 @@ Bug Fixes
 * [#16292](http://bugzilla.scilab.org/show_bug.cgi?id=16292): `hallchart()` had bugs and a poor rendering.
 * [#16293](http://bugzilla.scilab.org/show_bug.cgi?id=16293): Some demos run in step-by-step console mode(4) did not focus user's attention to the console to proceed.
 * [#16299](http://bugzilla.scilab.org/show_bug.cgi?id=16299): After `graypolarplot`, `colorbar` displayed an empty ungraduated color bar.
+* [#16300](http://bugzilla.scilab.org/show_bug.cgi?id=16300): Short description in while help page has been updated.
 * [#16303](http://bugzilla.scilab.org/show_bug.cgi?id=16303): log10(x) had wrong dimensions when x is an hypermatrix.
 * [#16307](http://bugzilla.scilab.org/show_bug.cgi?id=16307): `dockable="off"` and `closerequestfcn` on figures crached Scilab.
 * [#16320](http://bugzilla.scilab.org/show_bug.cgi?id=16320): There were unsupported UTF-8 characters in some gettext id messages.
index d17ff7e..f2400c4 100644 (file)
@@ -61,60 +61,48 @@ typeof(S)
         <screen><![CDATA[
 --> sys = zpk([2;1], [0;-3-%i;-3+%i], 2.5, "c")
  sys  =
-
         (s-2) (s-1)
    2.5 -------------
        s (s^2+6s+10)
 
-
 --> typeof(sys)
  ans  =
-
   "zpk"
 
--->
 
 --> S = zpk2ss(sys)
  S  =
 
-
  S(1)  (state-space system:)
 
   "lss"  "A"  "B"  "C"  "D"  "X0"  "dt"
 
  S(2)= A matrix =
-
    0.   1.         -0.3162278
    0.  -6.         -3.1622777
    0.   3.1622777   0.
 
  S(3)= B matrix =
-
    0.
    1.
    0.
 
  S(4)= C matrix =
-
   -5.   2.5  -0.7905694
 
  S(5)= D matrix =
-
    0.
 
  S(6)= X0 (initial state) =
-
    0.
    0.
    0.
 
  S(7)= Time domain =
-
   "c"
 
 --> typeof(S)
  ans  =
-
   "state-space"
 ]]></screen>
     </refsection>
index 69e3feb..fcaccee 100644 (file)
@@ -48,7 +48,6 @@
         <para>
             Converts a  zero pole gain representation to  rational transfer function
         </para>
-
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -62,30 +61,23 @@ typeof(S)
         <screen><![CDATA[
 --> sys = zpk([2;1], [0;-3-%i;-3+%i], 2.5, "c")
  sys  =
-
         (s-2) (s-1)
    2.5 -------------
        s (s^2+6s+10)
 
-
 --> typeof(sys)
  ans  =
-
   "zpk"
 
--->
-
 --> S = zpk2tf(sys)
  S  =
 
-
    5 -7.5s +2.5s²
    --------------
     10s +6s² +s³
 
 --> typeof(S)
  ans  =
-
   "rational"
 ]]></screen>
     </refsection>
index a0b7b3d..f8f710b 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="input">
+<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="input">
     <refnamediv>
         <refname>input</refname>
         <refpurpose>prompt for user input</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>x = input(message [, "string"])</synopsis>
+        <synopsis>
+            x = input(message)
+            x = input(message, "string")
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index 08d0e8e..6b91c61 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="input">
+<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="input">
     <refnamediv>
         <refname>input</refname>
         <refpurpose>ユーザ入力用のプロンプト</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>x = input(message [, "string"])</synopsis>
+        <synopsis>
+            x = input(message)
+            x = input(message, "string")
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>パラメータ</title>
index a16de81..0fcf91a 100644 (file)
@@ -23,7 +23,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>tohome()</synopsis>
+        <synopsis>tohome</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>説明</title>
index 1bcf19f..2813d8c 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="input" 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="input" xml:lang="pt">
     <refnamediv>
         <refname>input</refname>
         <refpurpose>prompt para entrada do usuário</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>x = input(message [, "string"])</synopsis>
+        <synopsis>
+            x = input(message)
+            x = input(message, "string")
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
index 23c29d1..b25c5c1 100644 (file)
@@ -23,7 +23,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>tohome()</synopsis>
+        <synopsis>tohome</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Описание</title>
index e9973da..9a99878 100644 (file)
                                     </member>
                                 </simplelist>
                             </listitem>
-                            <listitem>The same variable may be used several times
-                                in the list. Then, multiple assignments are done from
-                                <emphasis role="italic">right to left (!)</emphasis>
-                                and overwrite the previous ones.
-                                Example :
-                                <literal>[a,b,a] = (%pi, %z, "Allo")</literal>
-                                is equivalent to <literal>a = %pi, b = %z</literal>.
+                            <listitem>
+                                <literal>[a,b,a] = (%pi, %z, "Allo")</literal> performs assignments
+                                from left to right, such that finally <literal>a = "Allo"</literal>.
                             </listitem>
                         </itemizedlist>
                     </para>
@@ -360,7 +356,7 @@ u = schur(M)      // we expect and store only the first result u
 // Direct RHS list
 [a, b, c] = (%pi, %t, "test")
 [a, b] = (%e, %f, "Hello")
-[a, b, a] = (%pi, %t, "test");
+[a, b, a] = (%pi, %t, "test"); a
 
 // Explicit RHS list
 L = list(%z, %i, %t, %pi, "Text");
@@ -378,25 +374,25 @@ s.r([2 4 6])
 [r, s+3 ] = myfun(a,b)   // Expressions mixing literals and symbols like "s+3" can't be LHS recipients
 ]]></programlisting>
         <screen><![CDATA[--> [a, b, c] = (%pi, %t, "test")
- c  =
- test
+ a  =
+   3.1415927
 
  b  =
   T
 
- a  =
-   3.1415927
+ c  =
+ test
 
 --> [a, b] = (%e, %f, "Hello")
- b  =
-  F
-
  a  =
    2.7182818
 
+ b  =
+  F
+
 --> [a, b, a] = (%pi, %t, "test"); a
  a  =
-   3.1415927
+ test
 ]]></screen>
     </refsection>
     <refsection role="see also">
@@ -438,7 +434,15 @@ s.r([2 4 6])
             <revision>
                 <revnumber>6.1</revnumber>
                 <revdescription>
-                    Booleans and encoded integers can now be concatenated together, as in [%t, int8(-5)].
+                    <itemizedlist>
+                        <listitem>
+                            Booleans and encoded integers can now be concatenated together,
+                            as in [%t, int8(-5)].
+                        </listitem>
+                        <listitem>
+                            [a, b, ..] = (A, B,..) now performs assignments from left to right.
+                        </listitem>
+                    </itemizedlist>
                 </revdescription>
             </revision>
         </revhistory>
index 3f0e8b5..10ad938 100644 (file)
@@ -16,7 +16,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="while">
     <refnamediv>
         <refname>while</refname>
-        <refpurpose>while keyword</refpurpose>
+        <refpurpose>Opens a block of instructions iterated on a heading condition</refpurpose>
     </refnamediv>
     <refsection>
         <title>Description</title>
index ff5ed44..cd9b170 100644 (file)
@@ -57,9 +57,8 @@ a = sciargs()
 ! -noatomsautoload              !
 ! -args                         !
 ! Hello John                    !
-! 1.2345                        !
 ! "C:\Users\Me"                 !
-    ]]></screen>
+]]></screen>
         <para>
         <warning>
             Let's note that in <literal>scilab -nw</literal> the "-nw" option is used by
index 557702c..fbde7f0 100644 (file)
                                         produit une erreur, car <literal>c</literal>
                                         attend du contenu.
                                     </member>
-                                </simplelist>
-                            </listitem>
+                                </simplelist>                            </listitem>
                             <listitem>
-                                La même variable peut être utilisée plusieurs fois dans la liste
-                                de gauche entre crochets. Le cas échéant, les affectations
-                                successives sont réalisées
-                              <emphasis role="italic">de droite à gauche (!)</emphasis> dans la
-                              liste, et écrasent les contenus pré-existants. Exemple :
-                                <literal>[a,b,a] = (%pi, %z, "Allo")</literal>
-                                est équivalent à <literal>a = %pi, b = %z</literal>.
+                                <literal>[a,b,a] = (%pi, %z, "Allo")</literal> réalise les
+                                affectations de la gauche vers la droite, de sorte que finalement
+                                <literal>a = "Allo"</literal>.
                             </listitem>
                         </itemizedlist>
                     </para>
@@ -384,7 +379,7 @@ u = schur(M)      // Nous attendons et stockons uniquement u
 // Liste directe (implicite) d'objets à affecter
 [a, b, c] = (%pi, %t, "test")
 [a, b] = (%e, %f, "Hello")
-[a, b, a] = (%pi, %t, "test");
+[a, b, a] = (%pi, %t, "test"); a
 
 // Liste explicite d'objets à affecter
 L = list(%z, %i, %t, %pi, "Text");
@@ -403,25 +398,25 @@ s.r([2 4 6])
 [r, s+3 ] = myfun(a,b)   // "s+3" est une expression mixte, non un nom de variable
  ]]></programlisting>
         <screen><![CDATA[--> [a, b, c] = (%pi, %t, "test")
- c  =
- test
+ a  =
+   3.1415927
 
  b  =
   T
 
- a  =
-   3.1415927
+ c  =
+ test
 
 --> [a, b] = (%e, %f, "Hello")
- b  =
-  F
-
  a  =
    2.7182818
 
+ b  =
+  F
+
 --> [a, b, a] = (%pi, %t, "test"); a
  a  =
-   3.1415927
+ test
 ]]></screen>
     </refsection>
     <refsection role="see also">
@@ -463,8 +458,16 @@ s.r([2 4 6])
             <revision>
                 <revnumber>6.1</revnumber>
                 <revdescription>
-                    Booléens et entiers encodés peuvent désormais être concaténés ensemble,
-                    comme dans [%t, int8(-5)].
+                    <itemizedlist>
+                        <listitem>
+                            Booléens et entiers encodés peuvent désormais être concaténés ensemble,
+                            comme dans [%t, int8(-5)].
+                        </listitem>
+                        <listitem>
+                            [a, b, ..] = (A, B,..) réalise désormais les affectations de la gauche
+                            vers la droite.
+                        </listitem>
+                    </itemizedlist>
                 </revdescription>
             </revision>
         </revhistory>
index 1d08510..30ae859 100644 (file)
@@ -57,9 +57,8 @@ a = sciargs()
 ! -noatomsautoload              !
 ! -args                         !
 ! Hello John                    !
-! 1.2345                        !
 ! "C:\Users\Me"                 !
-    ]]></screen>
+]]></screen>
         <para>
         <warning>
             Notons qu'avec <literal>scilab -nw</literal>, l'option "-nw" option s'adresse et est
index 8100a67..a9476b9 100644 (file)
@@ -56,9 +56,8 @@ a = sciargs()
 ! -noatomsautoload              !
 ! -args                         !
 ! Hello John                    !
-! 1.2345                        !
 ! "C:\Users\Me"                 !
-    ]]></screen>
+]]></screen>
         <para>
         <warning>
             Let's note that in <literal>scilab -nw</literal> the "-nw" option is used by
index e0ed3b8..2dfcc2f 100644 (file)
@@ -57,9 +57,8 @@ a = sciargs()
 ! -noatomsautoload              !
 ! -args                         !
 ! Hello John                    !
-! 1.2345                        !
 ! "C:\Users\Me"                 !
-    ]]></screen>
+]]></screen>
         <para>
         <warning>
             Let's note that in <literal>scilab -nw</literal> the "-nw" option is used by
index 2ec1212..28c91e5 100644 (file)
@@ -56,9 +56,8 @@ a = sciargs()
 ! -noatomsautoload              !
 ! -args                         !
 ! Hello John                    !
-! 1.2345                        !
 ! "C:\Users\Me"                 !
-    ]]></screen>
+]]></screen>
         <para>
         <warning>
             Let's note that in <literal>scilab -nw</literal> the "-nw" option is used by
index 89a5f78..621f600 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en_US" xml:id="bitstring">
+<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_US" xml:id="bitstring">
   <refnamediv>
     <refname>bitstring</refname>
     <refpurpose>A string giving the literal bit representation of a number</refpurpose>
@@ -62,7 +65,7 @@
     bitstring(uint64(-1))
     ]]></programlisting>
   </refsection>
-  <refsection>
+  <refsection role="see also">
     <title>See also</title>
     <simplelist type="inline">
       <member>
index 88711dc..dcdcc1a 100644 (file)
                     </para>
                     <para>
                     <table>
-                    <tr>
+                    <tr valign="top">
                     <td>
                     <table>
                         <tr><td><literal>det([])</literal></td>     <td><literal>1</literal></td></tr>
                     <td></td>
                     <td>
                     <table>
+                        <tr><td><literal>cumprod([])</literal></td> <td><literal>[]</literal></td></tr>
+                        <tr><td><literal>cumsum([])</literal></td>  <td><literal>[]</literal></td></tr>
                         <tr><td><literal>sum([])</literal></td>     <td><literal>0</literal></td></tr>
                         <tr><td><literal>prod([])</literal></td>    <td><literal>1</literal></td></tr>
                         <tr><td><literal>mean([])</literal></td>    <td><literal>Nan</literal></td></tr>
index 6e23a57..527d133 100644 (file)
@@ -70,6 +70,9 @@
     </refsection>
     <refsection>
         <title>Examples</title>
+        <para>
+            With real and complex numbers:
+        </para>
         <programlisting role="example"><![CDATA[
 [i, inf, nan] = (%i, %inf, %nan);
 isinf([-1  0.01 -inf  inf  nan])
@@ -98,8 +101,7 @@ isinf(inf-nan*i)
         <literal>%inf - %nan*complex(0,1) == %inf - complex(%nan*0, %nan*1) == %inf - complex(%nan, %nan)
             == complex(%inf-%nan, -%nan) == complex(%nan, %nan)
         </literal>
-        ,where Inf is eaten by Nan
-        and no longer appears.
+        , where Inf is eaten by Nan and no longer appears.
         <para/>
         <para>
             With polynomials :
@@ -113,22 +115,18 @@ isinf([p q r])
         <screen><![CDATA[
 --> p = poly([%nan -2 0 3],"x","coeff")
  p  =
-
   Nan -2x +3x³
 
 --> q = poly([0 %inf %i],"x","coeff")
  q  =
-
   Infx +ix²
 
 --> r = poly([%nan %inf*%i 1],"x","coeff")
  r  =
-
   Nan -(Nan-Infi)x +x²
 
 --> isinf([p q r])
  ans  =
-
   F T F
 ]]></screen>
     </refsection>
index 09bbae9..3cb4a3b 100644 (file)
@@ -206,7 +206,7 @@ ax = gda();
 ax.title.font_size = 2;
 f = scf();
 f.color_map = hotcolormap(100);
-f.figure_size = [475 1050];
+f.axes_size = [900 450];
 f.figure_position(2) = 0;
 f.figure_name = "unwrap()" + _(": 2-D examples");
 drawlater()
@@ -226,7 +226,7 @@ for ex=0:1   // examples
         z = sqrt(0.3+sinc(sqrt(z)*3))*17-7;
     end
     // PLotting it in 3D
-    subplot(4,2,1+ex)
+    subplot(2,4,1+4*ex)
     surf(x, y, z)
     title("Original profile Z")
     e = gce();
@@ -236,7 +236,7 @@ for ex=0:1   // examples
     // Wrapped surface (flat)
     m = 2.8;
     zw = pmodulo(z, m); // wraps it
-    subplot(4,2,3+ex)
+    subplot(2,4,2+4*ex)
     grayplot(x, y, zw')
     title(msprintf("Zw = pmodulo(Z, %g)  (flat)",m))
     ax0 = gca();
@@ -245,7 +245,7 @@ for ex=0:1   // examples
     // Unwrapped surfaces (flat):
     // in both directions:
     u = unwrap(zw, 0);
-    subplot(4,2,5+ex)
+    subplot(2,4,3+4*ex)
     grayplot(x, y, u')
     title(msprintf("unwrap(Zw, %g)  (flat)", 0))
     ax3 = gca();
@@ -258,7 +258,7 @@ for ex=0:1   // examples
     end
     // Along a single direction:
     u = unwrap(zw, m, direc);
-    subplot(4,2,7+ex)
+    subplot(2,4,4+4*ex)
     grayplot(x, y, u')
     title(msprintf("unwrap(Zw, %g, ""%s"")  (flat)",m,direc))
     ax1 = gca();
@@ -267,9 +267,12 @@ end
 sda();
 drawnow()
         ]]></programlisting>
-        <!--<scilab:image>
-            %_unwrap("2D")
-        </scilab:image>-->
+        <para/>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../helptools/images/unwrap_2D.png"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index b19bbc6..f555680 100644 (file)
@@ -86,8 +86,7 @@
    0.   2.   4.   6.
    0.   2.   4.   6.
    0.   2.   4.   6.
-]]>
-    </screen>
+]]></screen>
     <para>
         Les coordonnées du noeud node(i,j) dans l'espace 2D seront alors
         simplement <literal>[x(i), y(j)]</literal> maintenant données par
index 878dce5..8437058 100644 (file)
@@ -61,6 +61,9 @@
     </refsection>
     <refsection>
         <title>Exemples</title>
+        <para>
+            Avec des nombres réels ou complexes :
+        </para>
         <programlisting role="example"><![CDATA[
 [i, inf, nan] = (%i, %inf, %nan);
 isinf([-1  0.01 -inf  inf  nan])
@@ -89,8 +92,7 @@ isinf(inf-nan*i)
         <literal>%inf - %nan*complex(0,1) == %inf - complex(%nan*0, %nan*1) == %inf - complex(%nan, %nan)
             == complex(%inf-%nan, -%nan) == complex(%nan, %nan)
         </literal>
-        ,où Inf est effacé par Nan et
-        n'apparait plus.
+        , où Inf est effacé par Nan et n'apparait plus.
         <para/>
         <para>
             Avec des polynômes :
@@ -104,22 +106,18 @@ isinf([p q r])
         <screen><![CDATA[
 --> p = poly([%nan -2 0 3],"x","coeff")
  p  =
-
   Nan -2x +3x³
 
 --> q = poly([0 %inf %i],"x","coeff")
  q  =
-
   Infx +ix²
 
 --> r = poly([%nan %inf*%i 1],"x","coeff")
  r  =
-
   Nan -(Nan-Infi)x +x²
 
 --> isinf([p q r])
  ans  =
-
   F T F
 ]]></screen>
     </refsection>
index c65a25f..21da6fa 100644 (file)
@@ -283,15 +283,16 @@ drawnow()
         <para>2次元面をアンラップ:</para>
         <programlisting role="example"><![CDATA[
 // 2次元の例
-// -----------
+// -------
 ax = gda();
 ax.title.font_size = 2;
 f = scf();
 f.color_map = hotcolormap(100);
-f.figure_size = [475 1050];
+f.axes_size = [900 450];
 f.figure_position(2) = 0;
 f.figure_name = "unwrap()" + _(": 2-D examples");
 drawlater()
+
 nx = 300;
 ny = 400;
 rmax = 8.8;
@@ -306,29 +307,33 @@ for ex=0:1   // 例
     else
         z = sqrt(0.3+sinc(sqrt(z)*3))*17-7;
     end
+
     // 3次元でプロットします
-    subplot(4,2,1+ex)
+    subplot(2,4,1+4*ex)
     surf(x, y, z)
     title("Original profile Z")
     e = gce();
     e.thickness = 0; // メッシュを削除
     e.parent.tight_limits = "on";
+
     // ラップされた面 (平面)
     m = 2.8;
     zw = pmodulo(z, m); // ラップする
-    subplot(4,2,3+ex)
+    subplot(2,4,2+4*ex)
     grayplot(x, y, zw')
     title(msprintf("Zw = pmodulo(Z, %g)  (flat)",m))
     ax0 = gca();
     ax0.tight_limits = "on";
+
     // アンラップされた面 (平面):
     // in both directions:
     u = unwrap(zw, 0);
-    subplot(4,2,5+ex)
+    subplot(2,4,3+4*ex)
     grayplot(x, y, u')
     title(msprintf("unwrap(Zw, %g)  (flat)", 0))
     ax3 = gca();
     ax3.tight_limits = "on";
+
     if ex==0 then
         direc = "r";
     else
@@ -336,7 +341,7 @@ for ex=0:1   // 例
     end
     // 一方向にアンラップ:
     u = unwrap(zw, m, direc);
-    subplot(4,2,7+ex)
+    subplot(2,4,4+4*ex)
     grayplot(x, y, u')
     title(msprintf("unwrap(Zw, %g, ""%s"")  (flat)",m,direc))
     ax1 = gca();
@@ -345,9 +350,12 @@ end
 sda();
 drawnow()
         ]]></programlisting>
-        <!--<scilab:image>
-            %_unwrap("2D")
-        </scilab:image>-->
+        <para/>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../helptools/images/unwrap_2D.png"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
index d303915..a75a09e 100644 (file)
@@ -77,27 +77,25 @@ atanh(x')
         </para>
         <programlisting role="example"><![CDATA[
 x = [-1-%i, -%i, 0, %i, %i+1];
-[tanh(atanh(x)) ; atanh(tanh(x))]
+[x; tanh(atanh(x)) ; atanh(tanh(x))]
 atanh(x.')
  ]]></programlisting>
     <screen><![CDATA[
---> [x ; atanh(tanh(x))]
+--> [x; tanh(atanh(x)) ; atanh(tanh(x))]
  ans  =
-  -Inf  -2.  -1.  -0.5   0.   0.5   1.   2.   3.   Inf
-  -Inf  -2.  -1.  -0.5   0.   0.5   1.   2.   3.   Inf
 
---> atanh(x')
+  -1. - i     0. - i     0. + 0.i   0. + i     1. + i  
+  -1. - i     0. - i     0. + 0.i   0. + i     1. + i  
+  -1. - i     0. - i     0. + 0.i   0. + i     1. + i  
+
+--> atanh(x.')
  ans  =
-   0.        + 1.5707963i
-  -0.5493061 + 1.5707963i
-  -Inf       + 0.i       
-  -0.5493061 + 0.i       
-   0.        + 0.i       
-   0.5493061 + 0.i       
-   Inf       + 0.i       
-   0.5493061 + 1.5707963i
-   0.3465736 + 1.5707963i
-   0.        + 1.5707963i
+
+  -0.4023595 - 1.017222i
+   0.        - 0.7853982i
+   0.        + 0.i      
+   0.        + 0.7853982i
+   0.4023595 + 1.017222i
 ]]></screen>
     </refsection>
     <refsection role="see also">
index f48dc45..98defc6 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en_US" xml:id="bitstring">
+<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_US" xml:id="bitstring">
   <refnamediv>
     <refname>bitstring</refname>
     <refpurpose>Строка, дающее символьное битовое представление числа</refpurpose>
@@ -62,7 +65,7 @@
     bitstring(uint64(-1))
     ]]></programlisting>
   </refsection>
-  <refsection>
+  <refsection role="see also">
     <title>Смотрите также</title>
     <simplelist type="inline">
       <member>
index e3dc605..2872b8f 100644 (file)
                     </para>
                     <para>
                     <table>
-                    <tr>
+                    <tr valign="top">
                     <td>
                     <table>
                         <tr><td><literal>det([])</literal></td>     <td><literal>1</literal></td></tr>
                     <td></td>
                     <td>
                     <table>
+                        <tr><td><literal>cumprod([])</literal></td> <td><literal>[]</literal></td></tr>
+                        <tr><td><literal>cumsum([])</literal></td>  <td><literal>[]</literal></td></tr>
                         <tr><td><literal>sum([])</literal></td>     <td><literal>0</literal></td></tr>
                         <tr><td><literal>prod([])</literal></td>    <td><literal>1</literal></td></tr>
                         <tr><td><literal>mean([])</literal></td>    <td><literal>Nan</literal></td></tr>
index db4e071..e497fca 100644 (file)
@@ -64,6 +64,9 @@
     </refsection>
     <refsection>
         <title>Примеры</title>
+        <para>
+            С действительными или комплексными числами :
+        </para>
         <programlisting role="example"><![CDATA[
 [i, inf, nan] = (%i, %inf, %nan);
 isinf([-1  0.01 -inf  inf  nan])
@@ -92,8 +95,7 @@ isinf(inf-nan*i)
         <literal>%inf - %nan*complex(0,1) == %inf - complex(%nan*0, %nan*1) == %inf - complex(%nan, %nan)
             == complex(%inf-%nan, -%nan) == complex(%nan, %nan)
         </literal>
-        ,где Inf съеден значениям Nan и
-        больше не появляется.
+        , где Inf съеден значениям Nan и больше не появляется.
         <para/>
         <para>
             С полиномами:
@@ -107,22 +109,18 @@ isinf([p q r])
         <screen><![CDATA[
 --> p = poly([%nan -2 0 3],"x","coeff")
  p  =
-
   Nan -2x +3x³
 
 --> q = poly([0 %inf %i],"x","coeff")
  q  =
-
   Infx +ix²
 
 --> r = poly([%nan %inf*%i 1],"x","coeff")
  r  =
-
   Nan -(Nan-Infi)x +x²
 
 --> isinf([p q r])
  ans  =
-
   F T F
 ]]></screen>
     </refsection>
index cc29406..c1b2d2b 100644 (file)
                                 <para>
                                     3 character string that sets the scale (linear or logarithmic) along the axes.
                                     Each character specifies the scale for respectively the X, Y and Z axes.
-                                    They should take a value between <literal>'n'</literal> for linear scale or
-                                    <literal>'l'</literal> for logarithmic scale.
+                                    They can be either <literal>'n'</literal> for the
+                                    <emphasis role="bold">n</emphasis>ormal scale, or
+                                    <literal>'l'</literal> for the
+                                    <emphasis role="bold">l</emphasis>ogarithmic one.
                                 </para>
                                 <scilab:image><![CDATA[
                                     x = linspace(0,10,100)(2:$);
index f074bab..ecf1905 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="fr" xml:id="get_figure_handle">
+<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="get_figure_handle">
     <refnamediv>
         <refname>get_figure_handle</refname>
-        <refpurpose>Retrouve une figure graphique à partir de son identifiant.</refpurpose>
+        <refpurpose>
+            Retrouve une figure graphique à partir de son identifiant
+            <emphasis role="bold">(obsolète)</emphasis>
+        </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
     </refsection>
     <refsection>
         <title>Description</title>
+        <warning>
+            <emphasis role="bold">Cette fonction est obsolète</emphasis> et sera retirée de
+            Scilab 6.1.x. SVP désormais utiliser <emphasis role="bold">findobj("figure_id",n)</emphasis>.
+        </warning>
         <para>
             La function <literal>get_figure_handle</literal> permet de retrouver le handle
             d'une figure graphique à partir de son identifiant. Si une figure avec l'identifiant
@@ -84,4 +94,16 @@ f42 = get_figure_handle(42);
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                    get_figure_handle(n) est déclarée obsolète.
+                    findobj("figure_id",n) la remplace.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 3a0a000..56e739f 100644 (file)
                                 <para>string de três caracteres que ajusta a escala (linear ou
                                     logarítmica) o longo dos eixos. Cada caractere especifica a
                                     escala para os eixos x, y e z respectivamente. Os valores
-                                    podem ser <literal>'n'</literal> para escala linear ou
-                                    <literal>'l'</literal> para escala logarítmica.
+                                    podem ser <literal>'n'</literal> para escala
+                                    <emphasis role="bold">n</emphasis>ormal, ou
+                                    <literal>'l'</literal> para escala
+                                    <emphasis role="bold">l</emphasis>ogarítmica.
                                 </para>
                                 <scilab:image><![CDATA[
                                     x = linspace(0,10,100)(2:$);
diff --git a/scilab/modules/helptools/images/unwrap_2D.png b/scilab/modules/helptools/images/unwrap_2D.png
new file mode 100644 (file)
index 0000000..355acde
Binary files /dev/null and b/scilab/modules/helptools/images/unwrap_2D.png differ
index ce0afdb..cd0dfd9 100644 (file)
                         translated. A column of literal texts explicitly separated with
                         semi-colons may also be specified.
                     </para>
+                    <warning>
+                        Only standard ASCII characters can be used. Any other extended ASCII or
+                        UTF-8 characters would make gettext() failing.
+                    </warning>
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                         single or array of messages identifiers (in english) to be translated,
                         in a variable.
                     </para>
+                    <warning>
+                        Only standard ASCII characters can be used.
+                    </warning>
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                         version in english is returned. The input and output arrays have
                         the same sizes.
                     </para>
+                    <note>
+                        These messages are defined in the ./locales/*.po files. They can include
+                        extended ASCII or UTF-8 characters.
+                    </note>
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
index 27eb3be..a5c0206 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Matlab binary files I/O",SCI+"/modules/matio/help/en_US",%T);
+add_help_chapter("Matlab data files I/O",SCI+"/modules/matio/help/en_US",%T);
 
index c01c3d9..375eb01 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Lecture/Ecriture de fichiers binaires Matlab",SCI+"/modules/matio/help/fr_FR",%T);
+add_help_chapter("Matlab : fichiers données (R/W)",SCI+"/modules/matio/help/fr_FR",%T);
 
index cbb3cb9..277921e 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Entrada/Saída de Arquivos Matlab Binários",SCI+"/modules/matio/help/pt_BR",%T);
+add_help_chapter("Matlab : Arquivos de dados (R/W)",SCI+"/modules/matio/help/pt_BR",%T);
 
diff --git a/scilab/modules/statistics/help/ja_JP/3_dispersion_widths/variance.xml b/scilab/modules/statistics/help/ja_JP/3_dispersion_widths/variance.xml
deleted file mode 100644 (file)
index 2c813d4..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2000 - INRIA - Carlos Klimann
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="variance">
-    <refnamediv>
-        <refname>variance</refname>
-        <refpurpose>ベクトルまたは行列の値の分散</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>s=variance(x[,orien[,w]])
-            s=variance(x,'r') or m=variance(x,1)
-            s=variance(x,'c') or m=variance(x,2)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>x</term>
-                <listitem>
-                    <para>実数または複素数のベクトルまたは行列</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>orien</term>
-                <listitem>
-                    <para>計算の向き.orienパタメータの有効な値は, 1, "r", 2および"c"です.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>w</term>
-                <listitem>
-                    <para>w : 使用する正規化の手法. 有効な値は0および1.
-                        これはxの列の数(orien=1が選択された場合)または
-                        行の数(orien=2が選択された場合)に依存します.
-                        w = 0 の場合,m-1で正規化され,分散の最適な非バイアス推定器が出力されます(これがデフォルト).
-                        w = 1 の場合, m で正規化され,平均周りの二次モーメントが出力されます.
-                        orienオプションが指定されない場合,
-                        n*m-1により正規化が行われます.ただし,n*mは行列における全要素数です.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            この関数は,ベクトルまたは行列<literal>x</literal>の値の分散を計算します.
-        </para>
-        <para>
-            あるベクトルまたは行列<literal>x</literal>について,
-            <literal>s=variance(x)</literal> は,スカラー<literal>s</literal>に
-            <literal>x</literal>の全てのエントリの分散を返します.
-        </para>
-        <para>
-            <literal>s=variance(x,'r')</literal> (または等価な, <literal>s=variance(x,1)</literal>)
-            は行方向の分散です.
-            この場合,行ベクトルsの各エントリに<literal>x</literal>の各列の分散が返されます.
-            複素数値を管理するよう一般化された式が使用されます.
-        </para>
-        <para>
-            <literal>s=variance(x,'c')</literal> (または等価な,<literal>s=variance(x,2)</literal>)
-            は列方向の分散です.
-            この場合,列ベクトル<literal>s</literal>の各エントリに
-            <literal>x</literal>の各行の分散を返します.
-            複素数値を管理するよう一般化された式が使用されます.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[
-x=[0.2113249 0.0002211 0.6653811;0.7560439 0.4453586 0.6283918]
-s=variance(x)
-s=variance(x,'r')
-s=variance(x,'c')
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="mtlb_var">mtlb_var</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>参考文献</title>
-        <para>
-            Wonacott, T.H. &amp; Wonacott, R.J.; Introductory Statistics, fifth edition, J.Wiley &amp; Sons, 1990.
-        </para>
-    </refsection>
-</refentry>