help: misc. typos and short improvements (no image changed) 09/19109/15
Samuel GOUGEON [Tue, 14 Feb 2017 01:14:26 +0000 (02:14 +0100)]
Change-Id: I4ae949f23d916a9c1e0715a36d3872b2ba116ef7

56 files changed:
scilab/CHANGES.md
scilab/modules/core/help/en_US/1_keywords/brackets.xml
scilab/modules/core/help/en_US/1_keywords/less.xml
scilab/modules/core/help/en_US/1_keywords/symbols.xml
scilab/modules/core/help/en_US/debugging/debug.xml
scilab/modules/core/help/en_US/variables/predefined/CHAPTER
scilab/modules/core/help/en_US/variables/predefined/percenteps.xml
scilab/modules/core/help/fr_FR/1_keywords/brackets.xml
scilab/modules/core/help/fr_FR/1_keywords/symbols.xml
scilab/modules/core/help/fr_FR/debugging/debug.xml
scilab/modules/core/help/fr_FR/variables/predefined/CHAPTER
scilab/modules/core/help/ja_JP/1_keywords/symbols.xml
scilab/modules/core/help/ja_JP/debugging/debug.xml [deleted file]
scilab/modules/core/help/ja_JP/variables/predefined/percenteps.xml
scilab/modules/core/help/pt_BR/1_keywords/brackets.xml [deleted file]
scilab/modules/core/help/pt_BR/1_keywords/symbols.xml
scilab/modules/core/help/pt_BR/debugging/debug.xml [deleted file]
scilab/modules/core/help/ru_RU/1_keywords/symbols.xml
scilab/modules/core/help/ru_RU/debugging/debug.xml
scilab/modules/core/help/ru_RU/variables/predefined/percenteps.xml
scilab/modules/dynamic_link/help/en_US/addinter.xml
scilab/modules/elementary_functions/help/en_US/and_op.xml
scilab/modules/elementary_functions/help/en_US/discrete/primes.xml
scilab/modules/elementary_functions/help/en_US/floating_point/format.xml
scilab/modules/elementary_functions/help/en_US/floating_point/ieee.xml
scilab/modules/elementary_functions/help/en_US/floating_point/number_properties.xml
scilab/modules/elementary_functions/help/en_US/or_op.xml
scilab/modules/elementary_functions/help/fr_FR/floating_point/format.xml
scilab/modules/elementary_functions/help/fr_FR/floating_point/ieee.xml
scilab/modules/elementary_functions/help/ja_JP/discrete/primes.xml
scilab/modules/elementary_functions/help/ja_JP/floating_point/ieee.xml
scilab/modules/elementary_functions/help/ja_JP/floating_point/number_properties.xml
scilab/modules/elementary_functions/help/pt_BR/discrete/primes.xml
scilab/modules/elementary_functions/help/pt_BR/floating_point/ieee.xml
scilab/modules/elementary_functions/help/pt_BR/floating_point/number_properties.xml
scilab/modules/elementary_functions/help/pt_BR/matrixmanipulation/squeeze.xml
scilab/modules/elementary_functions/help/ru_RU/floating_point/format.xml
scilab/modules/elementary_functions/help/ru_RU/floating_point/ieee.xml
scilab/modules/elementary_functions/help/ru_RU/floating_point/number_properties.xml
scilab/modules/graphics/help/en_US/2d_plot/Matplot_properties.xml
scilab/modules/graphics/help/en_US/axes_operations/replot.xml
scilab/modules/graphics/help/fr_FR/axes_operations/replot.xml
scilab/modules/graphics/help/ja_JP/axes_operations/replot.xml
scilab/modules/graphics/help/pt_BR/axes_operations/replot.xml
scilab/modules/graphics/locales/fr_FR.po
scilab/modules/integer/help/en_US/iconvert.xml
scilab/modules/integer/help/fr_FR/iconvert.xml
scilab/modules/integer/help/ja_JP/iconvert.xml
scilab/modules/integer/help/pt_BR/iconvert.xml
scilab/modules/integer/help/ru_RU/iconvert.xml
scilab/modules/io/help/en_US/file.xml
scilab/modules/io/help/en_US/read.xml
scilab/modules/io/help/ja_JP/file.xml
scilab/modules/io/help/ja_JP/read.xml
scilab/modules/io/help/pt_BR/file.xml
scilab/modules/io/help/pt_BR/read.xml

index 3f27240..c7ad8d6 100644 (file)
@@ -218,7 +218,7 @@ Help pages:
 
 * fixed / improved:  `members`, `part`, `ode`, `ode_optional_output`, `ode_roots`, `plot2d`, `roots`,
   `printf`, `sprintf`, `iconvert`, `stdev`, `xlabel`, `and_op`, `or_op`, `permute`, `tree2code`, `%helps`,
-  `scilab|scilex`, `flipdim`, `Matplot_properties`, `meshgrid`, `ismatrix`, `xget`, `xset`
+  `scilab|scilex`, `flipdim`, `Matplot_properties`, `meshgrid`, `ismatrix`, `xget`, `xset`, `ieee`
 * rewritten: `consolebox`, `double`, `isoview`, `pixel_drawing_mode`, `householder`, `or`, `|,||`,
 `and`, `&,&&`, `format`, `typeof`, `brackets`, `setlanguage`, `sleep`, `isinf`,
 `bitor`, `bitxor`, `bitand`, `macr2tree`, `geomean`, `clf`, `getPreferencesValue`
index 20f15ef..597368c 100644 (file)
                 <term>m11, m12,...  </term>
                 <listitem>
                     <para>
-                    Set of objects to be
-                    concatenated (and merged: the former individual containers
-                    are removed).
-                    The following subsets of types of objects can be mixed
+                    Set of objects to be concatenated (and merged: the former individual containers
+                    are removed). The following subsets of types of objects can be mixed
                     in-between, but are mutually exclusive:
                     <itemizedlist>
-                        <listitem>Matrices of booleans, reals, complex numbers,
-                            polynomials, rationals: The data type of the
-                            concatenated result is set by the rules defined below
-                            (see the <link linkend="brackets_Types_conversions">
+                        <listitem>Matrices of booleans, reals, complex numbers,  polynomials,
+                          rationals: The data type of the concatenated result is set by the rules
+                          defined below (see the <link linkend="brackets_Types_conversions">
                             <emphasis role="italic">type conversions</emphasis>
                             </link> rules).
                         </listitem>
                         <listitem>Matrices of encoded integers of any
                             <link linkend="inttype">inttype</link>.
                             <warning>
-                                Encoded integers of different inttypes can't
-                                be concatenated together.
+                                Encoded integers of different inttypes can't be concatenated together.
                             </warning>
                         </listitem>
-                        <listitem>Arrays of structures with same fields.
-                            Fields may be in different orders from an array
-                            to other ones.
+                        <listitem>
+                            Arrays of structures with same fields.  Fields may be in different
+                            orders from an array to other ones.
+                        </listitem>
+                        <listitem>
+                            Arrays of cells.
                         </listitem>
                         <listitem>
                             Typed lists of type <link linkend="syslin">syslin</link>.
@@ -73,7 +72,7 @@
                 <term>M, Mh, Mv</term>
                 <listitem>
                     <para>
-                        Matrices with the type of all <varname>m##</varname>
+                        Matrices or arrays with the type of all <varname>m##</varname>
                         (if they all have the same data type)
                     </para>
                 </listitem>
                     <para>[..] bundle their contents of simple and compatible
                         types into a homogeneous vector, matrix or hypermatrix.
                     </para>
-                    <note>An horizontal or a vertical concatenation is a
-                        binary iterated operator. It is performed step-by-step
-                        from left-to-right, and from top-to-bottom. Thus,
-                        <literal>[1 3 5 7]</literal> is performed as
+                    <note>
+                        An horizontal or a vertical concatenation is a binary iterated operator.
+                        It is performed step-by-step from left-to-right, and from top-to-bottom.
+                        Thus, <literal>[1 3 5 7]</literal> is performed as
                         <literal>[[[1 3] 5] 7]</literal>.
                     </note>
                     <para>Inside brackets,
                         <itemizedlist>
-                            <listitem>spaces (blanks or tabs) or commas are
-                                used as columns separators.
-                                <note>Using commas instead of spaces is safer.
-                                    For instance, <literal>[2 1 +%i]</literal>
-                                    means <literal>[2, 1, %i]</literal>, while
-                                    <literal>[2 1 + %i]</literal> means
+                            <listitem>
+                                spaces (blanks or tabs) or commas are used as columns separators.
+                                <note>
+                                    Using commas instead of spaces is safer. For instance,
+                                    <literal>[2 1 +%i]</literal> means <literal>[2, 1, %i]</literal>,
+                                    while <literal>[2 1 + %i]</literal> means
                                     <literal>[2, 1+%i]</literal>
                                 </note>
                             </listitem>
-                            <listitem>semi-colons or carriage-return are used
-                                as rows separators. Multiple rows do not need
-                                the continuation dots <literal>..</literal>
+                            <listitem>
+                                semi-colons or carriage-return are used as rows separators.
+                                Multiple rows do not need the continuation dots <literal>..</literal>
                             </listitem>
                         </itemizedlist>
                     </para>
                     <refsect3 id="brackets_Types_conversions">
                         <title>Types conversions</title>
                         <para>
-                            In some limits, brackets may be applied on a set of
-                            data having different but compatible types. In this
-                            case, some data are converted into the dominating type
-                            available in the set. The main conversion rules are the
-                            following:
+                            In some limits, brackets may be applied on a set of data having
+                            different but compatible types. In this case, some data are converted
+                            into the dominating type available in the set. The main conversion
+                            rules are the following:
                             <orderedlist>
                                 <listitem>boolean &lt; decimal number &lt; complex
                                 </listitem>
index d975e38..f8f1869 100644 (file)
@@ -5,7 +5,7 @@
         <refpurpose>(&lt;) less than comparison</refpurpose>
     </refnamediv>
     <refnamediv xml:id="greater">
-        <refname>great</refname>
+        <refname>greater</refname>
         <refpurpose>(&gt;) greater than comparison</refpurpose>
     </refnamediv>
     <refsection>
index 6627eed..0592a89 100644 (file)
             </tr>
             <tr>
                 <td>
-                    <literal>^</literal>
+                    <literal>^, .^</literal>
                 </td>
                 <td>
-                    <link linkend="hat">hat</link>
+                    <link linkend="hat">hat</link>, <link linkend="power">power</link>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <literal>.^</literal>
-                </td>
-                <td>
-                    <link linkend="power">power</link>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <literal>|</literal>
+                    <literal>|, ||</literal>
                 </td>
                 <td>
                     <link linkend="or_op">or_op</link>
             </tr>
             <tr>
                 <td>
-                    <literal>&amp;</literal>
+                    <literal>&amp;, &amp;&amp;</literal>
                 </td>
                 <td>
                     <link linkend="and_op">and_op</link>
                 </td>
             </tr>
         </informaltable>
-    </refsection>
-    <refsection>
-        <title>Remark</title>
-        <para>For historical reasons, different symbols may represent the same operator:</para>
-        <para>
-            <literal>{</literal> as the same meaning as <literal>[</literal>
-        </para>
-        <para>
-            <literal>}</literal> as the same meaning as <literal>]</literal>
-        </para>
-        <para>
-            <literal>@</literal> as the same meaning as <literal>~</literal>
-        </para>
-        <para>
-            <literal>`</literal> as the same meaning as &lt;
-        </para>
-        <para> It is highly recommended not to use these features because they will be removed in the future. </para>
+        <warning>
+          <para>For historical reasons, different symbols may represent the same operator:</para>
+          <para>
+              <literal>@</literal> as the same meaning as <literal>~</literal>
+          </para>
+          <para>
+              <literal>`</literal> as the same meaning as &lt;
+          </para>
+          <para> It is highly recommended not to use these features because they will be removed in
+            the future.
+          </para>
+        </warning>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index ae6ae42..a8ad611 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="debug">
+<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="debug">
     <refnamediv>
         <refname>debug</refname>
         <refpurpose>Debugging environment in Scilab</refpurpose>
             Use to debug Scilab script.
             After call of <literal>debug()</literal>, you enter in debug mode.
             This mode allows you to manage <literal>breakpoints</literal>,
-            launch execution with stop en error, execute script step by step, ...
+            launch execution with stop on error, execute script step by step, ...
 
-            When debug mode is active, prompt change to <literal>debug> </literal>.
+            In debugging mode, the prompt is <literal>debug> </literal>.
         </para>
         <term>Commands: </term>
         <variablelist>
             <varlistentry>
-                <term>(h)elp: </term>
-                <para>Show help on console</para>
+                <term>h: </term>
+                <para>
+                  Show always the debuger help in the console, whatever is the Scilab
+                  running mode.
+                 </para>
             </varlistentry>
             <varlistentry>
                 <term>help: </term>
-                <para>Show help on help browser when possible otherwise display help in console</para>
+                <para>
+                    In Scilab standard running mode (with GUIs), displays the debug() help page in
+                    the help browser. Otherwise, displays the help in the console (as with "h").
+                </para>
             </varlistentry>
             <varlistentry>
                 <term>(q)uit: </term>
                 <para>Display callstack.</para>
             </varlistentry>
             <varlistentry>
-                <term>(e)xec: </term>
-                <term>(r)un: </term>
+                <term>(e)xec or (r)un: </term>
                 <para>Execute command.</para>
             </varlistentry>
             <varlistentry>
-                <term>(d)isp var: </term>
-                <term>(p)rint var: </term>
+                <term>(d)isp var, or (p)rint var: </term>
                 <para>
                     Display variable <literal>var</literal>.
                 </para>
@@ -77,7 +84,8 @@
                     Add a breakpoint in a function at line <literal>line</literal>
                 </para>
                 <para>
-                    If a condition is specified, a breakpoint become enable only if condition is <literal>%t</literal>
+                    If a condition is specified, the breakpoint is enabled only if the condition
+                    is <literal>%t</literal>
                 </para>
             </varlistentry>
             <varlistentry>
index f0f8fe5..6dd9269 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="percenteps" 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="percenteps" xml:lang="en">
     <refnamediv>
         <refname>%eps</refname>
         <refpurpose>epsilon (floating-point relative accuracy)</refpurpose>
     </refsection>
     <refsection>
         <title>Example</title>
-        <programlisting role="example">%eps
-            format(20)
-            1 + %eps
-            1 + (%eps / 2) == 1
+        <programlisting role="example">
+          mw = format();
+          %eps
+          format(21);
+          1 + %eps
+          1 + (%eps / 2) == 1
+          format(mw([2 1]));
         </programlisting>
     </refsection>
     <refsection role="see also">
index 324c4cf..3d239fb 100644 (file)
                     <para>
                     Ensemble d'objets à concaténer (rassembler) et à fusionner :
                     les conteneurs individuels initiaux des objets sont supprimés.
-                    Les types d'objets des familles suivantes peuvent
-                    être mélangés entre eux dans une même famille, mais pas
-                    entre familles :
+                    Les types d'objets des familles suivantes peuvent être mélangés entre eux dans
+                    une même famille, mais pas entre familles :
                     <itemizedlist>
                         <listitem>
-                            Matrices de booléens, nombres décimaux,
-                            nombres complexes, polynômes, fractions rationnelles :
-                            le type de l'objet résultant est le type de l'élément le
-                            plus complexe, des booléens (le moins complexe) aux fractions
-                            rationelles à coefficients complexes
-                            (voir les règles de
-                            <link linkend="brackets_Types_conversions">
+                            Matrices de booléens, nombres décimaux, nombres complexes, polynômes,
+                            fractions rationnelles : le type de l'objet résultant est le type de
+                            l'élément le plus complexe, des booléens (le moins complexe) aux
+                            fractions rationelles à coefficients complexes
+                            (voir les règles de <link linkend="brackets_Types_conversions">
                             <emphasis role="italic">transtypages</emphasis></link>).
                         </listitem>
                         <listitem>Matrices d'entiers encodés de type entier
                             <link linkend="inttype">inttype</link> quelconque.
-                            <warning>Des entiers de types différents ne peuvent
-                            pas être concaténés entre eux.
+                            <warning>
+                            Des entiers de types différents ne peuvent pas être concaténés entre eux.
                             </warning>
                         </listitem>
-                        <listitem>Tableaux de structures ayant les mêmes champs.
-                            Les champs peuvent être dans des ordres différents
-                            d'un tableau à l'autre.
+                        <listitem>
+                            Tableaux de structures ayant les mêmes champs. Les champs peuvent être
+                            dans des ordres différents d'un tableau à l'autre.
+                        </listitem>
+                        <listitem>
+                            Tableaux de cellules.
                         </listitem>
                         <listitem>
                             Listes de type <link linkend="syslin">syslin</link>
@@ -77,7 +77,7 @@
                 <term>M, Mh, Mv</term>
                 <listitem>
                     <para>
-                        Matrices ayant le type des éléments <varname>m##</varname>
+                        Matrices ou tableaux ayant le type des éléments <varname>m##</varname>
                         (s'ils ont tous le même type).
                     </para>
                 </listitem>
index 7436101..ede1a0b 100644 (file)
             </tr>
             <tr>
                 <td>
-                    <literal>^</literal>
+                    <literal>^, .^</literal>
                 </td>
                 <td>
-                    <link linkend="hat">hat</link>
+                    <link linkend="hat">hat</link>, <link linkend="power">power</link>
                 </td>
             </tr>
             <tr>
-                <td>
-                    <literal>.^</literal>
-                </td>
-                <td>
-                    <link linkend="power">power</link>
-                </td>
-            </tr>
-            <tr>
-                <td> |</td>
+                <td> |, ||</td>
                 <td>
                     <link linkend="or_op">or_op</link>
                 </td>
             </tr>
             <tr>
-                <td> &amp;</td>
+                <td> &amp;, &amp;&amp;</td>
                 <td>
                     <link linkend="and_op">and_op</link>
                 </td>
                 </td>
             </tr>
         </informaltable>
-    </refsection>
-    <refsection>
-        <title>Remarque</title>
-        <para>Pour des raisons historiques,  des symboles différents peuvent représenter le même opérateur:</para>
-        <para>
-            <literal>{</literal> a la même signification que <literal>[</literal>
-        </para>
-        <para>
-            <literal>}</literal> a la même signification que <literal>]</literal>
-        </para>
-        <para>
-            <literal>@</literal> a la même signification que <literal>~</literal>
-        </para>
-        <para>
-            <literal>`</literal> a la même signification que  &lt;
-        </para>
-        <para> Il est fortement déconseillé d'utiliser ces opérateurs alternatifs, car il seront supprimés dans le futur.</para>
+        <warning>
+          <para>
+              Pour des raisons historiques, des symboles différents peuvent représenter le même
+              opérateur:
+          </para>
+          <para>
+              <literal>@</literal> a la même signification que <literal>~</literal>
+          </para>
+          <para>
+              <literal>`</literal> a la même signification que  &lt;
+          </para>
+          <para>
+              Il est fortement déconseillé d'utiliser ces opérateurs alternatifs, car il seront
+              supprimés dans le futur.
+          </para>
+       </warning>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
index 513d635..d0315fa 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="debug">
+<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="debug">
     <refnamediv>
         <refname>debug</refname>
-        <refpurpose>Environnement de déboggage dans Scilab</refpurpose>
+        <refpurpose>Environnement de débogage dans Scilab</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
     <refsection>
         <title>Description</title>
         <para>
-            Cet environnement sert a débogger un cript Scilab.
-            Après l'appel a <literal>debug()</literal>, vous entrez en mode debug.
+            Cet environnement sert à débogger un cript Scilab.
+            Après l'appel à <literal>debug()</literal>, vous entrez en mode debogage.
             Ce mode vous permet de manipuler des points d'arrêts,
             de lancer des exécutions avec arrêt sur erreur,
             d'exécuter des scripts en mode pas à pas ...
 
-            Une fois que ce mode est actif, l'invite devient <literal>debug> </literal>.
+            Dans la console, ce mode est indiqué par l'invite <literal>debug></literal>.
         </para>
         <term>Commandes: </term>
         <listitem>
             <variablelist>
                 <varlistentry>
-                    <term>(h)elp: </term>
-                    <para>Affiche l'aide dans la console</para>
+                    <term>h: </term>
+                    <para>
+                      Affiche l'aide du débogueur dans la console, quel que soit le mode de
+                      lancement de Scilab.
+                    </para>
                 </varlistentry>
                 <varlistentry>
                     <term>help: </term>
-                    <para>Affiche l'aide dans le navigateur si cela est possible sinon l'affiche dans la console</para>
+                    <para>
+                      En mode Scilab standard (avec fenêtres et interfaces graphiques), ouvre
+                      le navigateur d'aide. Sinon affiche l'aide du debogueur dans la console
+                      (comme avec "h").
+                    </para>
                 </varlistentry>
                 <varlistentry>
                     <term>(q)uit: </term>
-                    <para>Quitte l'environnement de déboggage et revient au mode normal de Scilab.</para>
+                    <para>Quitte l'environnement de débogage et revient au mode normal de Scilab.</para>
                 </varlistentry>
                 <varlistentry>
-                    <term>(w)here or bt: </term>
+                    <term>(w)here ou bt: </term>
                     <para>Affiche la pile d'appel.</para>
                 </varlistentry>
                 <varlistentry>
-                    <term>(e)xec: </term>
-                    <term>(r)un: </term>
+                    <term>(e)xec, ou (r)un: </term>
                     <para>Exécute une commande.</para>
                 </varlistentry>
                 <varlistentry>
-                    <term>(d)isp var: </term>
-                    <term>(p)rint var: </term>
+                    <term>(d)isp var, ou (p)rint var: </term>
                     <para>
                         Affiche la variable <literal>var</literal>.
                     </para>
                     <para>Annule l'éxécution.</para>
                 </varlistentry>
                 <varlistentry>
-                    <term>step(n)ext or next: </term>
+                    <term>step(n)ext ou next: </term>
                     <para>Poursuit l'éxécution jusqu'a l'expression suivante.</para>
                 </varlistentry>
                 <varlistentry>
-                    <term>step(i)n or in: </term>
+                    <term>step(i)n ou in: </term>
                     <para>Poursuit l'éxécution dans la sous fonction.</para>
                 </varlistentry>
                 <varlistentry>
-                    <term>step(o)ut or out: </term>
-                    <para>Poursuit l'éxécution jusqu'a revenir dans la fonction appelante.</para>
+                    <term>step(o)ut ou out: </term>
+                    <para>Poursuit l'éxécution jusqu'à revenir dans la fonction appelante.</para>
                 </varlistentry>
                 <varlistentry>
-                    <term>(b)reakpoint or break: </term>
+                    <term>(b)reakpoint ou break: </term>
                     <synopsis>breakpoint function [line [condition]]</synopsis>
                     <para>
-                        Ajoute un point d'arrêt dans une fonction a une ligne <literal>line</literal>
+                        Ajoute un point d'arrêt dans une fonction, à la ligne <literal>line</literal>
+                        indiquée.
                     </para>
                     <para>
-                        Si une condition est spécifiée, le point d'arrêt ne devient active que si la condition est <literal>%t</literal>
+                        Si une condition est spécifiée, le point d'arrêt devient actif uniquement si
+                        la condition est vérifiée.
                     </para>
                 </varlistentry>
                 <varlistentry>
                 <varlistentry>
                     <term>disable [n]: </term>
                     <para>Désactive tous les points d'arrêt.</para>
-                    <para>Si n est spécifié, désavtive le point d'arrêt #n</para>
+                    <para>Si n est spécifié, désactive le point d'arrêt #n</para>
                 </varlistentry>
                 <varlistentry>
                     <term>(s)how [n]: </term>
-                    <para>Affiche tous les information sur les points d'arrêt.</para>
-                    <para>Si n est spécifié, affiche les information du point d'arrêt #n</para>
+                    <para>Affiche toutes les informations sur les points d'arrêt.</para>
+                    <para>Si n est spécifié, affiche les informations du point d'arrêt #n</para>
                 </varlistentry>
             </variablelist>
         </listitem>
     </refsection>
     <refsection>
-        <title>Examples</title>
+        <title>Exemples</title>
         <programlisting role="example"><![CDATA[
 //fonction de surcharge de la fonction cosinus pour les chaînes de caractères
 function v = %c_cos(val)
@@ -149,11 +159,11 @@ quit
     </refsection>
 
     <refsection>
-        <title>History</title>
+        <title>Historique</title>
         <revhistory>
             <revision>
                 <revnumber>6.0.0</revnumber>
-                <revremark>Nouvelle version: Interface console avec le debugger de Scilab 6.</revremark>
+                <revremark>Introduction du débogueur intégré, en interface console</revremark>
             </revision>
         </revhistory>
     </refsection>
index 8daf171..757acab 100644 (file)
             </tr>
             <tr>
                 <td>
-                    <literal>^</literal>
+                    <literal>^,  .^</literal>
                 </td>
                 <td>
-                    <link linkend="hat">hat</link>
+                    <link linkend="hat">hat</link>, <link linkend="power">power</link>
                 </td>
             </tr>
             <tr>
-                <td>
-                    <literal>.^</literal>
-                </td>
-                <td>
-                    <link linkend="power">power</link>
-                </td>
-            </tr>
-            <tr>
-                <td>|</td>
+                <td>|, ||</td>
                 <td>
                     <link linkend="or_op">or_op</link>
                 </td>
             </tr>
             <tr>
-                <td>&amp;</td>
+                <td>&amp;,  &amp;&amp;</td>
                 <td>
                     <link linkend="and_op">and_op</link>
                 </td>
                 </td>
             </tr>
         </informaltable>
-    </refsection>
-    <refsection>
-        <title>注意</title>
-        <para>歴史的な理由により, 異なる記号が同じ演算子を表す場合があります:</para>
-        <para>
-            <literal>{</literal> は <literal>[</literal>と同じ意味です
-        </para>
-        <para>
-            <literal>}</literal> は <literal>]</literal>と同じ意味です
-        </para>
-        <para>
-            <literal>@</literal> は <literal>~</literal>と同じ意味です
-        </para>
-        <para>
-            <literal>`</literal> は &lt; と同じ意味です
-        </para>
-        <para> これらは将来削除される予定ですので,これらの機能を使用しないことを
-            強く推奨します.
-        </para>
+        <warning>
+            <para>歴史的な理由により, 異なる記号が同じ演算子を表す場合があります:</para>
+            <para>
+                <literal>@</literal> は <literal>~</literal>と同じ意味です
+            </para>
+            <para>
+                <literal>`</literal> は &lt; と同じ意味です
+            </para>
+            <para> これらは将来削除される予定ですので,これらの機能を使用しないことを
+                強く推奨します.
+            </para>
+        </warning>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
diff --git a/scilab/modules/core/help/ja_JP/debugging/debug.xml b/scilab/modules/core/help/ja_JP/debugging/debug.xml
deleted file mode 100644 (file)
index 086d401..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="debug">
-    <refnamediv>
-        <refname>debug</refname>
-        <refpurpose>Scilab内部のデバッギングレベル</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼出し手順</title>
-        <synopsis>debug(level_int)
-            level_int = debug()
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>引数</title>
-        <variablelist>
-            <varlistentry>
-                <term>level_int</term>
-                <listitem>
-                    <para>整数 (-1 から 4)</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            <varname>level_int</varname> の値 0,1,2,3,4 により,
-            <code>debug</code> はデバッグのレベルを定義します.
-            この関数はパーサ用で,
-            Scilabスクリプト用ではなく, Scilabのエキスパート専用です.
-        </para>
-        <para>
-            <note>
-                この関数の出力は Scilab 6.0.0で変更されます.
-            </note>
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[
-debug(3);
-2+2
-//  0.200E+01
-//+
-//  0.200E+01
-// eol
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title>履歴</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.4.0</revnumber>
-                <revremark>
-                    新しい値を設定した際,出力引数として過去の値が返されます.
-                </revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index 1ecef0f..cf50ee6 100644 (file)
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example">%eps
-            format(20)
-            1 + %eps
-            1 + (%eps / 2) == 1
+        <programlisting role="example">
+          mw = format();
+          %eps
+          format(21);
+          1 + %eps
+          1 + (%eps / 2) == 1
+          format(mw([2 1]));
         </programlisting>
     </refsection>
     <refsection role="see also">
diff --git a/scilab/modules/core/help/pt_BR/1_keywords/brackets.xml b/scilab/modules/core/help/pt_BR/1_keywords/brackets.xml
deleted file mode 100644 (file)
index ce99cc4..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="brackets" xml:lang="pt">
-    <refnamediv>
-        <refname>brackets</refname>
-        <refpurpose>([,]) colchetes esquerdo e direito</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[a11,a12,...;a21,a22,...;...]
-            [s1,s2,...]=func(...)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>a11,a12,...</term>
-                <listitem>
-                    <para>qualquer matriz (de reais, polinômios, razões de polinômios,
-                        lista <literal>syslin</literal>...) com dimensões apropriadas
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>s1,s2,...</term>
-                <listitem>
-                    <para>qualquer nome de variável possível </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>Colchetes esquerdo e direito são usados para notar concatenação de
-            vetores e matrizes. Estes símbolos também são usados para denotar lado
-            esquerdo múltiplo para a chamada de uma função.
-        </para>
-        <para>Dentro de colchetes de concatenação, espaços vazios ou vírgulas
-            significam "concatenação de colunas" e pontos-e-vírgulas ou retronos de
-            carro significa "concatenação de linhas".
-        </para>
-        <para>Nota : para evitar confusões, é melhor utilizar vírgulas, ao invés
-            de espaços vazios para separar colunas.
-        </para>
-        <para>Dentro de lados esquerdos múltiplos, os nomes das variáveis de vem
-            ser separados por vírgulas.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-[6.9,9.64; sqrt(-1) 0]
-[1 +%i  2 -%i  3]
-[]
-['this is';'a string';'vector']
-s=poly(0,'s');[1/s,2/s]
-[tf2ss(1/s),tf2ss(2/s)]
-
-[u,s]=schur(rand(3,3))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="comma">comma</link>
-            </member>
-            <member>
-                <link linkend="semicolon">semicolon</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 233f293..0c6c4b6 100644 (file)
             </tr>
             <tr>
                 <td>
-                    <literal>^</literal>
+                    <literal>^,  .^</literal>
                 </td>
                 <td>
-                    <link linkend="hat">hat</link> (chapéu, circunflexo)
+                    <link linkend="hat">hat</link>, <link linkend="power">power</link>
                 </td>
             </tr>
             <tr>
-                <td>
-                    <literal>.^</literal>
-                </td>
-                <td>
-                    <link linkend="power">power</link> (potência)
-                </td>
-            </tr>
-            <tr>
-                <td> |</td>
+                <td>|, ||</td>
                 <td>
                     <link linkend="or_op">or_op</link> (barra vertical, "ou" lógico)
                 </td>
             </tr>
             <tr>
-                <td> &amp;</td>
+                <td>&amp;,  &amp;&amp;</td>
                 <td>
                     <link linkend="and_op">and_op</link> ("e" comercial, "e" lógico)
                 </td>
                 </td>
             </tr>
         </informaltable>
-    </refsection>
-    <refsection>
-        <title> Observações</title>
-        <para>Por razões históricas, símbolos diferentes podem representar o mesmo
-            operador:
-        </para>
-        <para>
-            <literal>{</literal> tem o mesmo significado que
-            <literal>[</literal>
-        </para>
-        <para>
-            <literal>}</literal> tem o mesmo significado que
-            <literal>]</literal>
-        </para>
-        <para>
-            <literal>@</literal> tem o mesmo significado que
-            <literal>~</literal>
-        </para>
-        <para>
-            <literal>`</literal> tem o mesmo significado que &lt;
-        </para>
-        <para>É altamente recomendável que não se use esses recursos, pois eles
-            serão removidos futuramente
-        </para>
+        <warning>
+            <para>Por razões históricas, símbolos diferentes podem representar o mesmo operador:
+            </para>
+            <para>
+                <literal>@</literal> tem o mesmo significado que
+                <literal>~</literal>
+            </para>
+            <para>
+                <literal>`</literal> tem o mesmo significado que &lt;
+            </para>
+            <para>É altamente recomendável que não se use esses recursos, pois eles
+                serão removidos futuramente
+            </para>
+        </warning>
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
diff --git a/scilab/modules/core/help/pt_BR/debugging/debug.xml b/scilab/modules/core/help/pt_BR/debugging/debug.xml
deleted file mode 100644 (file)
index c540dca..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="debug" xml:lang="pt">
-    <refnamediv>
-        <refname>debug</refname>
-        <refpurpose>nivel de depuração ("debugging") debugging level</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>debug(level_int)
-            level_int = debug()
-            previous_level_int = debug(level_int)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>level_int</term>
-                <listitem>
-                    <para>inteiro (de 0 a 4)</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Para os valores 0, 1, 2, 3 ou 4 de <literal>level_int</literal> ,
-            define vários níveis de depuração. Isto é voltado para o analisador
-            sintático, não para scripts Scilab. Para usuários mais experientes do
-            Scilab.
-        </para>
-    </refsection>
-</refentry>
index de25a2f..debe27e 100644 (file)
             </tr>
             <tr>
                 <td>
-                    <literal>^</literal>
+                    <literal>^,  .^</literal>
                 </td>
                 <td>
-                    <link linkend="hat">hat</link>
+                    <link linkend="hat">hat</link>, <link linkend="power">power</link>
                 </td>
             </tr>
             <tr>
-                <td>
-                    <literal>.^</literal>
-                </td>
-                <td>
-                    <link linkend="power">power</link>
-                </td>
-            </tr>
-            <tr>
-                <td> |</td>
+                <td>|,  ||</td>
                 <td>
                     <link linkend="or_op">or_op</link>
                 </td>
             </tr>
             <tr>
-                <td> &amp;</td>
+                <td>&amp;,  &amp;&amp;</td>
                 <td>
                     <link linkend="and_op">and_op</link>
                 </td>
                 </td>
             </tr>
         </informaltable>
-    </refsection>
-    <refsection>
-        <title>Примечание</title>
-        <para>
-            В силу исторических причин различные символы могут представлять один и тот же оператор:
-        </para>
-        <para>
-            <literal>{</literal> то же самое, что и <literal>[</literal>
-        </para>
-        <para>
-            <literal>}</literal> то же самое, что и <literal>]</literal>
-        </para>
-        <para>
-            <literal>@</literal> то же самое, что и <literal>~</literal>
-        </para>
-        <para>
-            <literal>`</literal> то же самое, что и &lt;
-        </para>
-        <para>
-            Настоятельно рекомендуется не использовать эти символы, поскольку они будут в будущем удалены.
-        </para>
+        <warning>
+            <para>
+                В силу исторических причин различные символы могут представлять один и тот же оператор:
+            </para>
+            <para>
+                <literal>@</literal> то же самое, что и <literal>~</literal>
+            </para>
+            <para>
+                <literal>`</literal> то же самое, что и &lt;
+            </para>
+            <para>
+                Настоятельно рекомендуется не использовать эти символы, поскольку они будут в будущем удалены.
+            </para>
+        </warning>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
index 79437db..bcb45f8 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: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="debug">
+<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="debug">
     <refnamediv>
         <refname>debug</refname>
-        <refpurpose>уровень отладки</refpurpose>
+        <refpurpose>Среда отладки в Scilab</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            debug(level_int)
-            level_int = debug()
+            debug()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Аргументы</title>
+        <title>Описание</title>
+        <para>
+            Используйте для отладки Scilab-сценариев.
+            После вызова <code>debug()</code> вы войдёте в режим отладки.
+            Этот режим позволяет вам управлять <literal>точками останова</literal>,
+            запускать исполнение с остановкой на ошибке, исполнять сценарий пошагово, ...
+            В режиме отладки приглашением командной строки является <literal>debug> </literal>.
+        </para>
+        <term>Команды: </term>
         <variablelist>
             <varlistentry>
-                <term>level_int</term>
-                <listitem>
-                    <para>целое число (от -1 до 4)</para>
-                </listitem>
+                <term>h: </term>
+                <para>Показать справку в командном окне</para>
+            </varlistentry>
+            <varlistentry>
+                <term>help: </term>
+                <para>
+                  Показать справку в справочном браузере, если это возможно. В противном
+                  случае отобразить справку в командном окне</para>
+            </varlistentry>
+            <varlistentry>
+                <term>(q)uit: </term>
+                <para>Покинуть режим отладки и вернуться в нормальный режим Scilab'а.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>(w)here или bt: </term>
+                <para>Отобразить стек вызовов.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>(e)xec или (r)un: </term>
+                <para>Выполнить команду.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>(d)isp var, или (p)rint var: </term>
+                <para>
+                    Отобразить переменную <literal>var</literal>.
+                </para>
+            </varlistentry>
+            <varlistentry>
+                <term>(c)ontinue: </term>
+                <para>Продолжить исполнение.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>(a)bort: </term>
+                <para>Прервать исполнение.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>step(n)ext или next: </term>
+                <para>Продолжить исполнение до следующего выражения.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>step(i)n или in: </term>
+                <para>Продолжить исполнение до следующего выражения в подфункции.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>step(o)ut или out: </term>
+                <para>Продолжить исполнение до следующего выражения в предыдущей функции.</para>
+            </varlistentry>
+            <varlistentry>
+                <term>(b)reakpoint или break: </term>
+                <synopsis>breakpoint function [line [condition]]</synopsis>
+                <para>
+                    Добавить точку останова в функцию на строке <literal>line</literal>
+                </para>
+                <para>
+                    Если условие определено, то точка останова срабатывает только если условие равно
+                    <constant>%t</constant>
+                </para>
+            </varlistentry>
+            <varlistentry>
+                <term>(del)ete [n]: </term>
+                <para>Удалить все точки останова.</para>
+                <para>Если <varname>n</varname> определена, то удаляется точка останова №<varname>n</varname></para>
+            </varlistentry>
+            <varlistentry>
+                <term>enable [n]: </term>
+                <para>Включить все точки останова.</para>
+                <para>Если <varname>n</varname> определена, то включается точка останова №<varname>n</varname></para>
+            </varlistentry>
+            <varlistentry>
+                <term>disable [n]: </term>
+                <para>Отключить все точки останова.</para>
+                <para>Если <varname>n</varname> определена, то отключается точка останова №<varname>n</varname></para>
+            </varlistentry>
+            <varlistentry>
+                <term>(s)how [n]: </term>
+                <para>Показать информацию обо всех точках останова.</para>
+                <para>Если <varname>n</varname> определена, то показывается точка останова №<varname>n</varname></para>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Описание</title>
-        <para>
-            Для значений <varname>level_int</varname> 0, 1, 2, 3, 4  <code>debug</code>
-            определяет различные уровни отладки. Это предназначено для анализатора синтаксиса, не для
-            файлов-сценариев Scilab'а, и только для экспертов Scilab'а.
-        </para>
-        <para>
-            <note>
-                Выходное значение этой функции будет изменено в Scilab 6.0.0.
-            </note>
-        </para>
-    </refsection>
-    <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-debug(3);
-2+2
-//  0.200E+01
-//+
-//  0.200E+01
-// eol
+//функция для перегрузки косинуса на строковом значении
+function v = %c_cos(val)
+    printf("val : %s\n", val);
+    v = cos(evstr(val));
+endfunction
+
+// функция-вызыватель
+function a = test_debug()
+    b = cos("%pi");
+    a = b * 3;
+endfunction
+
+debug
+break test_debug
+exec test_debug
+where
+stepin
+disp val
+continue
+quit
  ]]></programlisting>
-    </refsection>
+        <programlisting role="example"><![CDATA[
+function v = compute(val)
+    v = 1;
+    for i=1:val
+        v = v * i;
+    end
+endfunction
 
+debug
+break compute 4 "i == 5"
+exec compute(10)
+disp val
+disp i
+disp v
+continue
+quit
+ ]]></programlisting>
+    </refsection>
     <refsection>
-        <title>History</title>
+        <title>История</title>
         <revhistory>
             <revision>
-                <revnumber>5.4.0</revnumber>
-                <revremark>
-                    Предыдущее значение возвращается в качестве выходного аргумента при установке нового значения.
-                </revremark>
+                <revnumber>6.0.0</revnumber>
+                <revremark>Новая версия: интерфейс командной строки для отладчика Scilab 6.</revremark>
             </revision>
         </revhistory>
     </refsection>
index ece8813..7d85b19 100644 (file)
     <refsection>
         <title>Пример</title>
         <programlisting role="example">
-            %eps
-            format(20)
-            1 + %eps
-            1 + (%eps / 2) == 1
+          mw = format();
+          %eps
+          format(21);
+          1 + %eps
+          1 + (%eps / 2) == 1
+          format(mw([2 1]));
         </programlisting>
     </refsection>
     <refsection role="see also">
index a1e45ad..c9070aa 100644 (file)
@@ -156,9 +156,9 @@ fun1_in_scilab(%pi)
 
 end // if haveacompiler()
 ]]></programlisting>
-        <refsection>
+        <refsect3>
             <title>Generated loader.sce with addinter</title>
-        </refsection>
+        </refsect3>
         <programlisting role="example"><![CDATA[// This file is released under the 3-clause BSD license. See COPYING-BSD.
 // Generated by builder.sce : Please, do not edit this file
 // ----------------------------------------------------------------------------
index 4382a68..5d3b0c9 100644 (file)
             <literal>&amp;&amp;</literal> with <literal>bitand()</literal> and
             <literal>and()</literal>
             </emphasis> :
-        </para>
-        <para>
             <itemizedlist>
                 <listitem>
                     <literal>and(A)</literal> is equivalent to <literal>A &amp;&amp; %T</literal>,
index 0010661..85ac5e4 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="primes" 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="primes" xml:lang="en">
     <refnamediv>
         <refname>primes</refname>
         <refpurpose>primes function</refpurpose>
@@ -44,7 +47,7 @@
         <para>
             Given a real <literal>x</literal>, <literal>primes(x)</literal>
             returns in a vector <literal>y</literal> all the primes numbers included
-            between 1 and <literal>x</literal>. If <literal>x&lt;2 </literal>then
+            between 1 and <literal>x</literal>. If <literal>x&lt;2</literal> then
             <literal>primes(x)</literal> returns an empty matrix.
         </para>
     </refsection>
index bed2cbd..9087390 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="format" 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="format" xml:lang="en">
     <refnamediv>
         <refname>format</refname>
         <refpurpose>set the default output format of decimal numbers</refpurpose>
@@ -24,7 +27,7 @@
             format(width)
             format(mode, width)
             format(wm)
-            v = format()
+            mw = format()
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>v</term>
+                <term>mw</term>
                 <listitem>
                     <para>vector returning the current formatting parameters:
                         <itemizedlist>
-                          <listitem><literal>v(1)</literal> is the formatting mode:
+                          <listitem><literal>mw(1)</literal> is the formatting mode:
                             0 for <literal>'e'</literal> and 1 for <literal>'v'</literal>
                           </listitem>
                           <listitem>
-                            <literal>v(2)</literal> is the width:
+                            <literal>mw(2)</literal> is the width:
                             Number of characters used to output each number.
                           </listitem>
                          </itemizedlist>
index b410f20..12d4a67 100644 (file)
@@ -1,12 +1,30 @@
 <?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="ieee" xml:lang="en">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="ieee" xml:lang="en">
     <refnamediv>
         <refname>ieee</refname>
-        <refpurpose>set floating point exception mode</refpurpose>
+        <refpurpose>sets or gets the floating point exception mode</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>mod=ieee()
+        <synopsis>mod = ieee()
             ieee(mod)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>ieee()</literal> returns the current floating point
-            exception mode.
-        </para>
+            <literal>ieee()</literal> returns the current floating point exception mode.
         <variablelist>
             <varlistentry>
                 <term>0</term>
                 <listitem>
-                    <para>floating point exception produces an error</para>
+                    <para>floating point exception produces an error.</para>
+                    <para>
+                       <literal>%inf</literal> and <literal>%nan</literal> special values can be
+                       used in this mode without error. For instance, <literal>%inf/%inf</literal>,
+                       <literal>%inf-%inf</literal> or <literal>%inf/%nan</literal> are known
+                       operations.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>1</term>
                 <listitem>
-                    <para>floating point exception produces a warning</para>
+                    floating point exception produces a warning.
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>2</term>
                 <listitem>
-                    <para>floating point exception produces Inf or Nan</para>
+                    floating point exception produces Inf or Nan.
                 </listitem>
             </varlistentry>
         </variablelist>
+        </para>
         <para>
-            <literal>ieee(mod)</literal> sets the current floating point
-            exception mode.
+            <literal>ieee(mod)</literal> sets the current floating point exception mode to
+            <varname>mod</varname>.
         </para>
+        <note>
+            The default initial mode is 2. This default value may be set in any of the following ways:
+            <itemizedlist>
+                <listitem>
+                  Through the Preferences GUI: <code>preferences</code>, in the section
+                  <emphasis role="italic">General => Environment => ieee</emphasis>.
+                </listitem>
+                <listitem>
+                  Equivalently, using <code>setPreferencesValue</code> as follows
+                  (to set the mode to 1) :
+                  <para>
+                  <literal>setPreferencesValue("//general/body/environment", ["fpe";"1"])</literal>
+                  </para>
+                </listitem>
+                <listitem>
+                    Or by using <literal>ieee(mod)</literal> in your startup file.
+                </listitem>
+            </itemizedlist>
+        </note>
         <warning>
-            <para>The initial mode value is 2.</para>
+            Floating point exception arising inside some library algorithms are not yet handled
+            by <literal>ieee</literal> modes.
         </warning>
     </refsection>
     <refsection>
-        <title>Remarks</title>
-        <para>Floating point exception arising inside some library algorithms are
-            not yet handled by <literal>ieee</literal> modes.
-        </para>
-    </refsection>
-    <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-ieee(1);1/0
-ieee(2);1/0,log(0)
+ieee(1); 1/0
+ieee(2); 1/0, log(0)
  ]]></programlisting>
     </refsection>
-    <refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="percentnan">%nan</link>
+            </member>
+            <member>
+                <link linkend="percentinf">%inf</link>
+            </member>
+            <member>
+                <link linkend="isinf">isinf</link>
+            </member>
+             <member>
+                <link linkend="isnan">isnan</link>
+            </member>
+           <member>
+                <link linkend="number_properties">number_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
         <title>History</title>
         <revhistory>
             <revision>
index 575eb98..6401315 100644 (file)
@@ -48,9 +48,7 @@
         <para>
             <latex>$d_i$</latex> the digits are in <literal>[0, b-1]</literal>
             and <literal>e</literal> in <literal>[emin, emax]</literal>, the number is
-            said "normalized" if <latex>$d_1 \neq 0$</latex>. The following may be
-            gotten:
-        </para>
+            said "normalized" if <latex>$d_1 \neq 0$</latex>. The following queries may be used:
         <variablelist>
             <varlistentry>
                 <term>prop = "radix"</term>
                 </listitem>
             </varlistentry>
         </variablelist>
-    </refsection>
-    <refsection>
-        <title>Remarks</title>
-        <para>This function uses the lapack routine dlamch to get the machine
-            parameters (the names (radix, digit, huge, etc...) are those recommended
-            by the LIA 1 standard and are different from the corresponding lapack's
-            ones).
-        </para>
-        <para>
-            <warning>
-                CAUTION: sometimes you can see the following definition for the
-                epsilon machine : <latex>$eps = b^{1-p}$</latex> but in this function we
-                use the traditional one (see prop = "eps" before) and so <latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
-                if normal rounding occurs and <latex>$eps = b^{1-p}$</latex>
-                if not.
-            </warning>
-        </para>
+      </para>
+        <note>
+            This function uses the lapack routine <literal>dlamch</literal> to get the machine
+            parameters (the names (radix, digit, huge, etc...) are those recommended by the LIA 1
+            standard and are different from the corresponding lapack's ones).
+        </note>
+        <warning>
+          Sometimes you can see the following definition for the epsilon machine :
+          <latex>$eps = b^{1-p}$</latex> but in this function we use the traditional one
+          (see prop = "eps" before) and so <latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
+          if normal rounding occurs, and <latex>$eps = b^{1-p}$</latex> otherwise.
+        </warning>
     </refsection>
     <refsection>
         <title>Examples</title>
index 21b058a..2c60889 100644 (file)
         <para>
             <emphasis role="bold">Comparing <literal>|</literal> and <literal>||</literal> with
             <literal>bitor()</literal> and <literal>or()</literal></emphasis> :
-        </para>
-        <para>
             <itemizedlist>
                 <listitem>
                     <literal>or(A)</literal> is equivalent to <literal>A || %F</literal>, whereas
index d1d2f33..7d008d2 100644 (file)
@@ -14,8 +14,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="format" xml:lang="fr">
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="format" xml:lang="fr">
     <refnamediv>
         <refname>format</refname>
         <refpurpose>configure le format par défaut d'affichage des nombres décimaux</refpurpose>
@@ -27,7 +27,7 @@
             format(width)
             format(mode, width)
             format(wm)
-            v = format()
+            mw = format()
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>v</term>
+                <term>mw</term>
                 <listitem>
                     <para>vecteur à 2 nombres retournés comme paramètres du format actif :
                         <itemizedlist>
-                          <listitem><literal>v(1)</literal> représente le type du format :
+                          <listitem><literal>mw(1)</literal> représente le type du format :
                             0 pour <literal>'e'</literal> et 1 pour <literal>'v'</literal>
                           </listitem>
-                          <listitem><literal>v(2)</literal> est le nombre de
+                          <listitem><literal>mw(2)</literal> est le nombre de
                             caractères utilisés pour formater chaque nombre.
                           </listitem>
                          </itemizedlist>
     </refsection>
     <refsection role="description">
         <title>Description</title>
-        <note>Pour les nombres complexes, chaque partie réelle et imaginaire
-        décimale est formatée selon <literal>format(..)</literal>.
-        La largeur totale d'un nombre complexe est par conséquent deux fois
-        celle spécifiée par <literal>format(..)</literal> + 1 caractère
-        (symbole "i").
+        <note>
+            Pour les nombres complexes, chaque partie réelle et imaginaire
+          décimale est formatée selon <literal>format(..)</literal>.
+          La largeur totale d'un nombre complexe est par conséquent deux fois
+          celle spécifiée par <literal>format(..)</literal> + 1 caractère
+          (symbole "i").
         </note>
         <note>
             Les entiers encodés ne sont jamais formatables/formatés selon
index 4566fc2..7ffab1f 100644 (file)
@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="ieee">
     <refnamediv>
         <refname>ieee</refname>
-        <refpurpose>détermine le mode d'exception IEEE pour les calculs  </refpurpose>
+        <refpurpose>fixe ou indique le mode d'exception IEEE pour les calculs</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>mod=ieee()
+        <synopsis>mod = ieee()
             ieee(mod)
         </synopsis>
     </refsynopsisdiv>
         <title>Description</title>
         <para>
             <literal>ieee()</literal> renvoie le mode d'exception IEEE courant pour les calculs en virgule flottante.
-        </para>
         <variablelist>
             <varlistentry>
                 <term>0</term>
                 <listitem>
-                    <para>les exceptions produisent une erreur
+                    <para>les exceptions produisent une erreur</para>
+                    <para>
+                       Dans ce mode, les valeurs spéciales <literal>%inf</literal> et
+                       <literal>%nan</literal> sont utilisables sans erreur. Par exemple, les
+                       opérations <literal>%inf/%inf</literal>,  <literal>%inf-%inf</literal> ou
+                       <literal>%inf/%nan</literal> seront effectuées sans produire d'erreur.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>1</term>
                 <listitem>
-                    <para>les exceptions produisent un warning
-                    </para>
+                    les exceptions produisent un warning.
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>2</term>
                 <listitem>
-                    <para> les exceptions produisent Inf ou Nan
-                    </para>
+                    les exceptions produisent Inf ou Nan.
                 </listitem>
             </varlistentry>
         </variablelist>
+        </para>
         <para>
-            <literal>ieee(mod)</literal> choisit le mode d'exception ieee courant pour les calculs en virgule flottante.
+            <literal>ieee(mod)</literal> fixe le mode d'exception IEEE courant pour les calculs en
+            virgule flottante.
         </para>
+        <note>
+            Le mode initial par défaut est 2. Ce réglage peut être modifié indifféremment comme suit:
+            <itemizedlist>
+                <listitem>
+                  Via l'interface des Préférences : <code>preferences</code>, section
+                  <emphasis role="italic">Général => Environment => ieee</emphasis>.
+                </listitem>
+                <listitem>
+                  En utilisant <code>setPreferencesValue</code> comme suit (ici pour ieee(1)) :
+                  <para>
+                  <literal>setPreferencesValue("//general/body/environment", ["fpe";"1"])</literal>
+                  </para>
+                </listitem>
+                <listitem>
+                    Ou en indiquant <literal>ieee(mod)</literal> dans votre fichier de démarrage
+                    personnel.
+                </listitem>
+            </itemizedlist>
+        </note>
         <warning>
-            <para>
-                La valeur initiale au lancement de Scilab est 2.
-            </para>
-        </warning>
-    </refsection>
-    <refsection>
-        <title>REMARQUES</title>
-        <para>
             Certaines exceptions IEEE générées dans certains algorithmes provenant de
             bibliothèques ne sont pas prises en compte par les modes <literal>ieee</literal>
             pour l'instant.
-        </para>
+        </warning>
     </refsection>
     <refsection>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-ieee(1);1/0
-ieee(2);1/0,log(0)
+ieee(1); 1/0
+ieee(2); 1/0, log(0)
  ]]></programlisting>
     </refsection>
+    <refsection role="see also">
+        <title>Voir aussi</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="percentnan">%nan</link>
+            </member>
+            <member>
+                <link linkend="percentinf">%inf</link>
+            </member>
+            <member>
+                <link linkend="isinf">isinf</link>
+            </member>
+            <member>
+                <link linkend="isnan">isnan</link>
+            </member>
+            <member>
+                <link linkend="number_properties">number_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
     <refsection>
         <title>Historique</title>
         <revhistory>
index ffcbbda..b7a249b 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="primes" 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="primes" xml:lang="ja">
 
     <refnamediv>
 
@@ -79,7 +82,7 @@
 
             ベクトル<literal>y</literal>を返します.
 
-            <literal>x&lt;2 </literal>の場合,
+            <literal>x&lt;2 </literal> の場合,
 
             <literal>primes(x)</literal> は空の行列を返します.
 
index 7dc0a21..31d89ba 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ieee" xml:lang="ja">
-
     <refnamediv>
-
         <refname>ieee</refname>
-
         <refpurpose>浮動小数点例外モードを設定</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼出し手順</title>
-
-        <synopsis>mod=ieee()
-
+        <synopsis>
+            mod = ieee()
             ieee(mod)
-
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>mod</term>
-
                 <listitem>
-
                     <para>
-
                         整数スカラーで,0,1または2を指定
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             <literal>ieee()</literal> はカレントの浮動小数点例外モード
-
             を返します.
-
-        </para>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>0</term>
-
                 <listitem>
-
                     <para>浮動小数点例外はエラーを発生</para>
-
+                    <para>
+                       <literal>%inf</literal> and <literal>%nan</literal> special values can be
+                       used in this mode without error. For instance, <literal>%inf/%inf</literal>,
+                       <literal>%inf-%inf</literal> or <literal>%inf/%nan</literal> are known
+                       operations.
+                    </para>
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>1</term>
-
                 <listitem>
-
-                    <para>浮動小数点例外は警告を発生</para>
-
+                    浮動小数点例外は警告を発生.
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>2</term>
-
                 <listitem>
-
-                    <para>浮動小数点例外は無限大(Inf)またはNaNを発生</para>
-
+                    浮動小数点例外は無限大(Inf)またはNaNを発生.
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
+        </para>
         <para>
-
-            <literal>ieee(mod)</literal> はカレントの浮動小数点例外モード
-
-            を設定します.
-
+            <literal>ieee(mod)</literal> sets the current floating point exception mode to
+            <varname>mod</varname>.
         </para>
-
-        <para>初期モードの値は 0 です.</para>
-
-    </refsection>
-
-    <refsection>
-
-        <title>注意</title>
-
-        <para>ライブラリのアルゴリズムの内部で発生した浮動小数点例外は,
-
+        <note>
+            The default initial mode is 2. This default value may be set in any of the following ways:
+            <itemizedlist>
+                <listitem>
+                  Through the Preferences GUI: <code>preferences</code>, in the section
+                  <emphasis role="italic">General => Environment => ieee</emphasis>.
+                </listitem>
+                <listitem>
+                  Equivalently, using <code>setPreferencesValue</code> as follows
+                  (to set the mode to 1) :
+                  <para>
+                  <literal>setPreferencesValue("//general/body/environment", ["fpe";"1"])</literal>
+                  </para>
+                </listitem>
+                <listitem>
+                    Or by using <literal>ieee(mod)</literal> in your startup file.
+                </listitem>
+            </itemizedlist>
+        </note>
+        <warning>
+            ライブラリのアルゴリズムの内部で発生した浮動小数点例外は,
             まだ<literal>ieee</literal>モードでは設定できません.
-
-        </para>
-
+        </warning>
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
-ieee(1);1/0
-ieee(2);1/0,log(0)
+ieee(1); 1/0
+ieee(2); 1/0, log(0)
  ]]></programlisting>
-
     </refsection>
-</refentry>
-
+    <refsection role="see also">
+        <title>参照</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="percentnan">%nan</link>
+            </member>
+            <member>
+                <link linkend="percentinf">%inf</link>
+            </member>
+            <member>
+                <link linkend="isinf">isinf</link>
+            </member>
+            <member>
+                <link linkend="isnan">isnan</link>
+            </member>
+            <member>
+                <link linkend="number_properties">number_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>2 is now the initial mode value.</revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
\ No newline at end of file
index 0c6b403..4bbea7a 100644 (file)
 
             以下の値を取得できます:
 
-        </para>
-
         <variablelist>
 
             <varlistentry>
 
         </variablelist>
 
-    </refsection>
-
-    <refsection>
-
-        <title>注意</title>
-
-        <para>
+      </para>
+      <note>
 
             この関数は機械パラメータを取得するために
 
 
             対応する Lapack の定義とは異なっています) ;
 
-        </para>
-
-        <para>
-
-            <warning>
+        </note>
 
-                注意: 機械イプシロンに関して以下のような定義を見ることが
+        <warning>
 
-                あるはずです: <latex>$eps = b^{1-p}$</latex>
+            機械イプシロンに関して以下のような定義を見ることが
 
-                しかし, この関数では伝統的な定義 (前記のprop = "eps"を参照)を
+            あるはずです: <latex>$eps = b^{1-p}$</latex>
 
-                使用しており,
+            しかし, この関数では伝統的な定義 (前記のprop = "eps"を参照)を
 
-                このため,通常の丸めが発生する場合に<latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
+            使用しており,
 
-                ,そうでない場合に <latex>$eps = b^{1-p}$</latex>
+            このため,通常の丸めが発生する場合に<latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
 
-                となります.
+            ,そうでない場合に <latex>$eps = b^{1-p}$</latex>
 
-            </warning>
+            となります.
 
-        </para>
+        </warning>
 
     </refsection>
 
index f453cd5..0a079a9 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="primes" 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="primes" xml:lang="pt">
     <refnamediv>
         <refname>primes</refname>
-        <refpurpose>função dos primos</refpurpose>
+        <refpurpose>função dos primos</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[y]=primes(x)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>x</term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
             Dado um real <literal>x</literal>, <literal>primes(x)</literal>
-            retorna em um vetor <literal>y</literal> todos os números primos entre 1 e
-            <literal>x</literal>. Se <literal>x&lt;2 </literal>então,
+            retorna em um vetor <literal>y</literal> todos os números primos entre 1 e
+            <literal>x</literal>. Se <literal>x&lt;2 </literal> então,
             <literal>primes(x)</literal> retorna uma matriz vazia.
         </para>
     </refsection>
@@ -56,7 +59,7 @@ y=primes(x)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="factor">factor</link>
index b8ff634..65b0396 100644 (file)
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ieee" xml:lang="pt">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+    xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+    xmlns:scilab="http://www.scilab.org" xml:id="ieee" xml:lang="pt">
     <refnamediv>
         <refname>ieee</refname>
-        <refpurpose>ajusta o modo de exceção de ponto flutuante</refpurpose>
+        <refpurpose>ajusta o modo de exceção de ponto flutuante</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>mod=ieee()
             ieee(mod)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>mod</term>
                 <listitem>
-                    <para>escalar inteiro com possíveis valores 0,1,ou 2</para>
+                    <para>escalar inteiro com possíveis valores 0,1,ou 2</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            <literal>ieee()</literal> retorna o modo de exceção de ponto
+            <literal>ieee()</literal> retorna o modo de exceção de ponto
             flutuante corrente
-        </para>
         <variablelist>
             <varlistentry>
                 <term>0</term>
                 <listitem>
-                    <para>exceção de ponto flutuante produz um erro;</para>
+                    <para>exceção de ponto flutuante produz um erro;</para>
+                    <para>
+                       <literal>%inf</literal> and <literal>%nan</literal> special values can be
+                       used in this mode without error. For instance, <literal>%inf/%inf</literal>,
+                       <literal>%inf-%inf</literal> or <literal>%inf/%nan</literal> are known
+                       operations.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>1</term>
                 <listitem>
-                    <para>exceção de ponto flutuante produz um aviso; </para>
+                    >exceção de ponto flutuante produz um aviso.
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>2</term>
                 <listitem>
-                    <para>exceção de ponto flutuante produz um Inf ou NaN ("infinito" ou
-                        "não é número").
-                    </para>
+                    exceção de ponto flutuante produz um Inf ou NaN ("infinito" ou
+                        "não é número").
                 </listitem>
             </varlistentry>
         </variablelist>
+        </para>
         <para>
-            <literal>ieee(mod)</literal> ajusta o modo corrente de excessão de
-            ponto flutuante.
+            <literal>ieee(mod)</literal> sets the current floating point exception mode to
+            <varname>mod</varname>.
         </para>
+        <note>
+            The default initial mode is 2. This default value may be set in any of the following ways:
+            <itemizedlist>
+                <listitem>
+                  Through the Preferences GUI: <code>preferences</code>, in the section
+                  <emphasis role="italic">General => Environment => ieee</emphasis>.
+                </listitem>
+                <listitem>
+                  Equivalently, using <code>setPreferencesValue</code> as follows
+                  (to set the mode to 1) :
+                  <para>
+                  <literal>setPreferencesValue("//general/body/environment", ["fpe";"1"])</literal>
+                  </para>
+                </listitem>
+                <listitem>
+                    Or by using <literal>ieee(mod)</literal> in your startup file.
+                </listitem>
+            </itemizedlist>
+        </note>
         <warning>
-            <para>O valor de modo incial é 2.</para>
+            Exceções de ponto flutuante emergentes em alguns algoritmos de  bibliotecas ainda não
+            são manipuladas pelos modos <literal>ieee</literal>.
         </warning>
     </refsection>
     <refsection>
-        <title>Observações </title>
-        <para>Exceções de ponto flutuante emergentes em alguns algoritmos de
-            bibliotecas ainda não são manipuladas pelos modos
-            <literal>ieee</literal>.
-        </para>
-    </refsection>
-    <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
 ieee(1);1/0
 ieee(2);1/0,log(0)
  ]]></programlisting>
     </refsection>
-    <revhistory>
-        <revision>
-            <revnumber>6.0.0</revnumber>
-            <revremark>O valor de modo incial é 2.</revremark>
-        </revision>
-    </revhistory>
+    <refsection role="see also">
+        <title>Ver também</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="percentnan">%nan</link>
+            </member>
+            <member>
+                <link linkend="percentinf">%inf</link>
+            </member>
+            <member>
+                <link linkend="isinf">isinf</link>
+            </member>
+            <member>
+                <link linkend="isnan">isnan</link>
+            </member>
+            <member>
+                <link linkend="number_properties">number_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>O valor de modo incial é 2.</revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 7a80830..012270f 100644 (file)
@@ -2,14 +2,14 @@
 <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="number_properties" xml:lang="pt">
     <refnamediv>
         <refname>number_properties</refname>
-        <refpurpose>determina parâmetros de ponto flutuante</refpurpose>
+        <refpurpose>determina parâmetros de ponto flutuante</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>pr = number_properties(prop)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>prop</term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição </title>
-        <para>Esta função pode ser usada para receber os números/propriedades
-            característicos do conjunto de pontos flutuantes aqui dentoado por
+        <title>Descrição </title>
+        <para>Esta função pode ser usada para receber os números/propriedades
+            característicos do conjunto de pontos flutuantes aqui dentoado por
             <literal>F(b,p,emin,emax)</literal> ((geralmente o conjunto de "floats" de
-            64 bits prescritos por IEEE 754). Números de <literal>F</literal> são da
+            64 bits prescritos por IEEE 754). Números de <literal>F</literal> são da
             forma:
         </para>
         <para>
             <code>sign * m * b^e</code>
         </para>
         <para>
-            <literal>e</literal> é o expoente e <literal>m</literal> a
+            <literal>e</literal> é o expoente e <literal>m</literal> a
             mantissa:
         </para>
         <latex>
             $$
         </latex>
         <para>
-            <latex>$d_i$</latex> os dígitos estão em <literal>[0,
+            <latex>$d_i$</latex> os dígitos estão em <literal>[0,
                 b-1]
             </literal>
             e<literal>e</literal> em <literal>[emin, emax]</literal>,
-            o número é dito "normalizado" se <latex>$d_1 \neq 0$</latex>. Os seguintes
+            o número é dito "normalizado" se <latex>$d_1 \neq 0$</latex>. Os seguintes
             podem ser recebidos:
-        </para>
         <variablelist>
             <varlistentry>
                 <term>prop = "radix"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é a raiz <literal>b</literal> do
+                        então <literal>pr</literal> é a raiz <literal>b</literal> do
                         conjunto <literal>F</literal>
                     </para>
                 </listitem>
@@ -67,7 +66,7 @@
                 <term>prop = "digits"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é o número de dígitos de
+                        então <literal>pr</literal> é o número de dígitos de
                         <literal>p</literal>
                     </para>
                 </listitem>
@@ -76,7 +75,7 @@
                 <term>prop = "huge"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é o maior float positivo de
+                        então <literal>pr</literal> é o maior float positivo de
                         <literal>F</literal>
                     </para>
                 </listitem>
@@ -85,7 +84,7 @@
                 <term>prop = "tiny"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é o menor float normalizado
+                        então <literal>pr</literal> é o menor float normalizado
                         positivo de <literal>F</literal>
                     </para>
                 </listitem>
@@ -94,8 +93,8 @@
                 <term>prop = "denorm"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é um booleano (%t se números
-                        denormalizados são utilizados)
+                        então <literal>pr</literal> é um booleano (%t se números
+                        denormalizados são utilizados)
                     </para>
                 </listitem>
             </varlistentry>
                 <term>prop = "tiniest"</term>
                 <listitem>
                     <para>
-                        então se denorm = %t, <literal>pr</literal> é o número
-                        positivo denormalizado mínimo. Em outro caso, <literal>pr</literal>
+                        então se denorm = %t, <literal>pr</literal> é o número
+                        positivo denormalizado mínimo. Em outro caso, <literal>pr</literal>
                         = tiny
                     </para>
                 </listitem>
                 <term>prop = "eps"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é a máquina epsilon ( geralmente
-                        (<latex>$\dfrac{b^{1-p}}{2}$</latex>) que é o erro máximo relativo entre
-                        um real <literal>x</literal> (tal que <literal>|x|</literal> está em
+                        então <literal>pr</literal> é a máquina epsilon ( geralmente
+                        (<latex>$\dfrac{b^{1-p}}{2}$</latex>) que é o erro máximo relativo entre
+                        um real <literal>x</literal> (tal que <literal>|x|</literal> está em
                         <literal>[tiny, huge]</literal>) e <literal>fl(x)</literal>, sua
-                        aproximação em ponto flutuante em <literal>F</literal>
+                        aproximação em ponto flutuante em <literal>F</literal>
                     </para>
                 </listitem>
             </varlistentry>
                 <term>prop = "minexp"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é <literal>emin</literal>
+                        então <literal>pr</literal> é <literal>emin</literal>
                     </para>
                 </listitem>
             </varlistentry>
                 <term>prop = "maxexp"</term>
                 <listitem>
                     <para>
-                        então <literal>pr</literal> é <literal>emax</literal>
+                        então <literal>pr</literal> é <literal>emax</literal>
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
-    </refsection>
-    <refsection>
-        <title>Observações</title>
-        <para>Esta função usa uma rotina de LAPACK dlamch para receber os
-            parâmetros máquinas (os nomes (radix, digits, huge, etc...) são aqueles
-            recomendados pelo padrão LIA 1 e são diferentes daqueles correspondentes
-            em LAPACK) ; CUIDADO: às vezes você poderá encontrar a seguinte para a
-            máquina epsilon: <latex>$eps = b^{1-p}$</latex>, mas nesta função nós
-            usamos a definição tradicional (ver prop = "eps" acima) e então
-            <latex>$eps = \dfrac{b^{1-p}}{2}$</latex> se o arredondamento normal acontecer
-            e <latex>$eps = b^{1-p}$</latex> se não acontecer.
         </para>
+        <note>
+            Esta função usa uma rotina de LAPACK dlamch para receber os  parâmetros máquinas
+            (os nomes (radix, digits, huge, etc...) são aqueles  recomendados pelo padrão
+            LIA 1 e são diferentes daqueles correspondentes em LAPACK).
+        </note>
+        <warning>
+            Às vezes você poderá encontrar a seguinte para a  máquina epsilon:
+            <latex>$eps = b^{1-p}$</latex>, mas nesta função nós usamos a definição tradicional
+            (ver prop = "eps" acima) e então <latex>$eps = \dfrac{b^{1-p}}{2}$</latex> se o
+            arredondamento normal acontecer e <latex>$eps = b^{1-p}$</latex> se não acontecer.
+        </warning>
     </refsection>
     <refsection>
         <title>Exemplos</title>
@@ -159,7 +158,7 @@ eps = number_properties("eps")
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="nearfloat">nearfloat</link>
index 1a92c18..bf29c62 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * 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="squeeze" 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="squeeze" xml:lang="pt">
     <refnamediv>
         <refname>squeeze</refname>
         <refpurpose>remoção de dimensões singletons</refpurpose>
index 64282f5..2e15e36 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: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="format" xml:lang="ru">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2016 - Samuel GOUGEON
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="format" xml:lang="ru">
     <refnamediv>
         <refname>format</refname>
-        <refpurpose>формат числа распечатываемого и выводимого на экран</refpurpose>
+        <refpurpose>установка выходного формата десятичных чисел по умолчанию</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            format([type],[long])
-            v = format()
-            format(m)
+            format(mode)
+            format(width)
+            format(width, mode)
+            format(wm)
+            mw = format()
         </synopsis>
     </refsynopsisdiv>
-    <refsection>
+    <refsection role="parameters">
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
-                <term>type</term>
+                <term>mode</term>
                 <listitem>
-                    <para>символьная строка</para>
+                    <para>режим форматирования:
+                        <itemizedlist>
+                          <listitem>1 или "v": форматирование адаптированное к переменной. 
+                           Scilab выбирает либо прямое представление (например -143.8757) либо
+                            экспоненциальную/инженерную/научную запись (например -1.438E+02),
+                            для того, чтобы справиться с каждым обрабатываемым значением, а также
+                           с требуемой шириной, с максимальным количеством символов на выходе.
+                          </listitem>
+                          <listitem>0 или "e": Устанавливается экспоненциальная или инженерная запись
+                            и используется для всех чисел.
+                          </listitem>
+                      </itemizedlist>
+                  </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>long</term>
+                <term>width</term>
                 <listitem>
-                    <para>целое число (максимальное число знаков (по умолчанию 10))</para>
+                    <para>
+                     ширина чесел равна количеству используемых символов на выходе, 
+                     сюда включается всё: знак мантиссы, её цифры, десятичный разделить, символ
+                     экспоненты, знак и цифры экспоненты. По умолчанию <varname>width</varname> равно 10.
+                     Минимальная ширина в режиме <literal>e</literal> равна 8.
+                   </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>v</term>
+                <term>wm</term>
                 <listitem>
-                    <para>
-                        вектор текущего формата
-                    </para>
-                    <para>
-                        <literal>v(1)</literal> -- тип формата : 0 для 'e'
-                        и 1 для 'v';
-                    </para>
-                    <para>
-                        <literal>v(2)</literal> количество знаков.
+                    <para>вектор для установки нового формата</para>
+                    <para><literal>wm(1)</literal> это ширина</para>
+                    <para><literal>wm(2)</literal> это режим форматирования: 0 для
+                      <literal>'e'</literal> и 1 для <literal>'v'</literal>
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>m</term>
+                <term>mw</term>
                 <listitem>
-                    <para>вектор для установки в новый формат</para>
-                    <para>m(1) -- количество знаков;</para>
-                    <para>m(2) -- тип формата: 0 для 'e' и 1 для 'v'</para>
-                </listitem>
+                    <para>
+                     вектор, возвращающий параметры текущего форматирования:
+                        <itemizedlist>
+                          <listitem>
+                           <literal>mw(1)</literal> это режим форматирования:
+                            0 для <literal>'e'</literal> и 1 для <literal>'v'</literal>
+                          </listitem>
+                          <listitem>
+                            <literal>mw(2)</literal> это ширина:
+                            Количество символов, используемых для выдачи каждого числа.
+                          </listitem>
+                         </itemizedlist>
+                     </para>
+                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
-    <refsection>
+    <refsection role="description">
         <title>Описание</title>
-        <para>
-            Устанавливает текущий формат отображения с помощью параметра
-            <literal>type</literal>; он может быть одним из:
-        </para>
-        <variablelist>
-            <varlistentry>
-                <term>"v"</term>
-                <listitem>
-                    <para>для переменного формата (по умолчанию);</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>"e"</term>
-                <listitem>
-                    <para>для e-формата.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <para>
-            Значение <literal>long</literal> определяет максимальное число знаков (по умолчанию 10).
-            <literal>format()</literal> возвращает вектор текущего формата:
-            первый элемент -- это тип формата (1, если "v" ; 0, если "e"; второй элемент -- это число знаков.
-        </para>
-        <para>
-            В старых версиях Scilab'а в режиме "переменный формат" элементы вектора, которые меньше
-            максимального абсолютного значения элемента в <literal>%eps</literal> раз, будут
-            отображены как "0". Теперь не так. Функция <literal>clean</literal> может быть использована для установки отбрасываемых элементов в нули.
-        </para>
+            <note>
+             Для комплексных чисел вещественная и мнимые десятичные части выдаются в
+             соответствии с <literal>format(..)</literal>. Общая ширина комплексного
+             числа, следовательно, грубо говоря в два раза больше
+             (плюс один символ для обозначения мнимой единицы "i").
+            </note>
+            <note>
+             Кодированные целые числа никогда не выдаются в экспоненциальном режиме,
+             даже когда это форматирование является режимом по умолчанию, установленным
+             для десятичных чисел. Для них десятичный разделитель "." пропущен. Это
+             позволяет отличить их от десятичных целых чисел, которые имеют точку.
+            </note>
+            <note>
+             Для широкого формата, символы, которые могут быть отображены ниже относительной точности
+             <literal>%eps</literal>, установлены в 0.
+            </note>
+            <warning>
+             Установка формата десятичных чисел по умолчанию с помощью <function>format(..)</function>
+             является глобальным параметром: где бы вы его ни установили, он будет
+             потом применяться везде в Scilab и Xcos.
+            </warning>
+         <para>
+           В старых версиях Scilab в режиме "формат переменной", вектор, элементы которого
+           меньше, чем в <literal>%eps</literal> раз максимального абсолютного значения
+           элементов, отображались как "0". Теперь функцию <function>clean</function> не
+           нужно использовать для установки ничтожно малых элементов в ноль.
+         </para>
     </refsection>
-    <refsection>
+    <refsection role="examples">
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-x=rand(1,5);
-format('v',10);x
-format(20);x
-format('e',10);x
-format(20);x
-
-x=[100 %eps];
-format('e',10);x
-format('v',10);x
-
-format("v")
+// format() не принимается в расчёт для кодированных целых чисел
+// -------------------------------------------------------------
+format("e",8)
+int32(2.^grand(3,5,"uin",0,30))
+// format() влияет на вывод в командном окне disp(), string(), sci2exp(),...
+// -------------------------------------------------------------------------
+a = %pi; p = %pi + %z - %e*%z^2;
+format("v",10);
+a, p
+disp(a,p)
+string(a), string(p)
+[sci2exp(a) sci2exp(p)]
+format("e",15);
+a, p
+disp(a,p)
+string(a), string(p)
+[sci2exp(a) sci2exp(p)]
+format("v",10); // сброс
+// format() устанавливает ширину, не фиксированное количество символов:
+// --------------------------------------------------------------------
+format("v",10)
+%pi*1e-217, s = string(%pi*1e-217)
+length(s) // отсутствующим символом является явный знак "+"
+// Это полезно для получения выравненного и полностью информативного отображения матриц
+[ -1.234 %pi*1e-10 %nan ; %e*1e137 -%inf 54312]
+// Начиная с Scilab 6.0, не имеющие значения символы, отображаемые широким format(), устанавливаются в 0:
+format(22)
+%pi
+// format() имеет глобальное влияние
+// ----------------------------
+function myfun()
+    format("e",20)
+endfunction
+format("v", 10)
+disp(%pi)
+myfun()
+// он остаётся везде, где бы ни был установлен:
+disp(%pi)
+format("v",10) // сброс
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Смотрите также</title>
+        <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="write">write</link>
+                <link linkend="number_properties">свойства чисел</link>
+            </member>
+            <member>
+                <link linkend="string">string</link>
+            </member>
+            <member>
+                <link linkend="sci2exp">sci2exp</link>
             </member>
             <member>
                 <link linkend="disp">disp</link>
@@ -114,6 +187,30 @@ format("v")
             <member>
                 <link linkend="clean">clean</link>
             </member>
-        </simplelist>
+            <member>
+                <link linkend="printf_conversion">C-подобный формат</link>
+            </member>
+            <member>
+                <link linkend="mprintf">mprintf</link>
+            </member>
+            <member>
+                <link linkend="msprintf">msprintf</link>
+            </member>
+            <member>
+                <link linkend="mfprintf">mfprintf</link>
+            </member>
+      </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0</revnumber>
+                <revdescription>
+                 Для широкого format(), символы, которые могут быть отображены
+                 ниже относительной точности %eps, теперь устанавливаются в 0.
+                </revdescription>
+            </revision>
+        </revhistory>
     </refsection>
 </refentry>
index 68a8c28..7a1cdfb 100644 (file)
@@ -1,5 +1,23 @@
 <?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="ieee" xml:lang="ru">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2017 - Samuel GOUGEON
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="ieee" xml:lang="ru">
     <refnamediv>
         <refname>ieee</refname>
         <refpurpose>установка режима исключения с плавающей запятой</refpurpose>
@@ -7,7 +25,7 @@
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            mod=ieee()
+            mod = ieee()
             ieee(mod)
         </synopsis>
     </refsynopsisdiv>
         <title>Описание</title>
         <para>
             <literal>ieee()</literal> возвращает текущий режим исключения с плавающей запятой.
-        </para>
         <variablelist>
             <varlistentry>
                 <term>0</term>
                 <listitem>
                     <para>исключение с плавающей запятой формирует ошибку</para>
+                    <para>
+                       специальные значения <constant>%inf</constant> и <constant>%nan</constant> 
+                       могут использоваться в этом режиме без ошибок. Например, <code>%inf/%inf</code>,
+                       <code>%inf-%inf</code> или <code>%inf/%nan</code> являются известными операциями.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>1</term>
                 <listitem>
-                    <para>исключение с плавающей запятой формирует предупреждение</para>
+                    >исключение с плавающей запятой формирует предупреждение.
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>2</term>
                 <listitem>
-                    <para>исключение с плавающей запятой формирует значение Inf или Nan</para>
+                    исключение с плавающей запятой формирует значение <constant>%inf</constant> или <constant>%nan</constant>.
                 </listitem>
             </varlistentry>
         </variablelist>
+        </para>
         <para>
-            <literal>ieee(mod)</literal> устанавливает текущий режим исключения с плавающей запятой.
+            <code>ieee(mod)</code> устанавливает текущий режим исключения с плавающей запятой в режим
+            <varname>mod</varname>.
         </para>
+        <note>
+            По умолчанию исходный режим 2. Это значение по умолчанию можно установить любым из следующих способов:
+            <itemizedlist>
+                <listitem>
+                  Через графический интерфейс настроек: <code>preferences</code>, в разделе
+                  <emphasis role="italic">Общие => Рабочая среда => ieee</emphasis>.
+                </listitem>
+                <listitem>
+                  Аналогично, используя <code>setPreferencesValue</code> следующим образом
+                  (чтобы установить режим в 1) :
+                  <para>
+                  <literal>setPreferencesValue("//general/body/environment", ["fpe";"1"])</literal>
+                  </para>
+                </listitem>
+                <listitem>
+                    Или используя <literal>ieee(mod)</literal> в вашем файле запуска.
+                </listitem>
+            </itemizedlist>
+        </note>
         <warning>
-            <para>Исходное значение режима равно 2.</para>
+            Исключение с плавающей запятой, возникающее внутри некоторых библиотечных алгоритмов,
+            пока ещё не обрабатывается режимами <literal>ieee</literal>.
         </warning>
     </refsection>
     <refsection>
-        <title>Примечания</title>
-        <para>
-            Исключение с плавающей запятой, возникающее внутри некоторых библиотечных алгоритмов, пока ещё не обрабатывается режимами <literal>ieee</literal>.
-        </para>
-    </refsection>
-    <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-ieee(1);1/0
-ieee(2);1/0,log(0)
+ieee(1); 1/0
+ieee(2); 1/0, log(0)
  ]]></programlisting>
     </refsection>
-    <revhistory>
-        <revision>
-            <revnumber>6.0.0</revnumber>
-            <revremark>Исходное значение режима равно 2.</revremark>
-        </revision>
-    </revhistory>
+    <refsection role="see also">
+        <title>Смотрите также</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="percentnan">%nan</link>
+            </member>
+            <member>
+                <link linkend="percentinf">%inf</link>
+            </member>
+            <member>
+                <link linkend="isinf">isinf</link>
+            </member>
+            <member>
+                <link linkend="isnan">isnan</link>
+            </member>
+            <member>
+                <link linkend="number_properties">number_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>Исходное значение режима равно 2.</revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index f80def2..5d271d4 100644 (file)
@@ -53,7 +53,6 @@
             а <literal>e</literal> находится в диапазоне
             <literal>[emin, emax]</literal>, скажем, что число "нормированное", если
             <latex>$d_1 \neq 0$</latex>. Можно получить следующие сведения:
-        </para>
         <variablelist>
             <varlistentry>
                 <term>prop = "radix"</term>
@@ -96,7 +95,7 @@
                 <term>prop = "denorm"</term>
                 <listitem>
                     <para>
-                        тогда <literal>pr</literal> является логическим значением (%t,
+                        тогда <literal>pr</literal> является логическим значением (<constant>%t</constant>,
                         если используются ненормированные числа)
                     </para>
                 </listitem>
                 <term>prop = "minexp"</term>
                 <listitem>
                     <para>
-                        тогда <literal>pr</literal> является
-                        <literal>emin</literal>
+                        тогда <literal>pr</literal> является <literal>emin</literal>
                     </para>
                 </listitem>
             </varlistentry>
                 <term>prop = "maxexp"</term>
                 <listitem>
                     <para>
-                        тогда <literal>pr</literal> является
-                        <literal>emax</literal>
+                        тогда <literal>pr</literal> является <literal>emax</literal>
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
-    </refsection>
-    <refsection>
-        <title>Примечания</title>
-        <para>
+        </para>
+        <note>
             Эта функция использует подпрограмму dlamch для получения параметров
             машины (имена (radix, digit, huge и т. д.) рекомендованы стандартом LIA 1
-            и отличаются от соответствующих имён lapack); ПРЕДУПРЕЖДЕНИЕ: иногда вы
-            можете увидеть следующее определение машинного эпсилона: <latex>$eps = b^{1-p}$</latex>
-            ,но в этой функции мы используем традиционное определение
+            и отличаются от соответствующих имён lapack).
+        </note>
+        <warning>
+            иногда вы можете увидеть следующее определение машинного эпсилона:
+            <latex>$eps = b^{1-p}$</latex>,но в этой функции мы используем традиционное определение
             (см. выше prop = "eps") и поэтому <latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
-            ,если производится нормальное округление, а
+            , если производится нормальное округление, а
             если нет, то <latex>$eps = b^{1-p}$</latex>.
-        </para>
+        </warning>
     </refsection>
     <refsection>
         <title>Примеры</title>
index 84746e0..3bdbff6 100644 (file)
                                         <varname>data</varname> as a matrix of uint32 provides RGBA colors where the alpha channel will be set to 0xFF.
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         <varname>data</varname> as a matrix of int32 or uint32 provides RGBA colors.
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         <varname>data</varname> as a matrix of int32 or uint32 provides ARGB colors.
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         <varname>data</varname> of another type is considered as RGB intensities. They are then converted into red levels (a mask is applied to keep the Red component).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         <varname>data</varname> of another type is considered as RGB intensities. They are then converted into green levels (a mask is applied to keep the Green component).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         <varname>data</varname> of another type is considered as RGB intensities. They are then converted into blue levels (a mask is applied to keep the Blue component).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         For other <varname>data</varname> types, RGB (8-8-8) data are converted into RGB (3-3-2).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         For other <varname>data</varname> types, RGB (8-8-8) data are converted into RGB (4-4-4).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         For other <varname>data</varname> types, RGB (8-8-8) data are converted into RGB (5-5-5).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         For other <varname>data</varname> types, RGBA (8-8-8-8) data are converted into RGBA (4-4-4-4).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                                         For other <varname>data</varname> types, RGBA (8-8-8-8) data are converted into RGBA (5-5-5-1).
                                     </listitem>
                                 </itemizedlist>
-                                <para></para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
index b4b1bde..0b5deab 100644 (file)
@@ -17,7 +17,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="replot">
     <refnamediv>
         <refname>replot</refname>
-        <refpurpose>redraw with new boundaries the current or a given set of axes
+        <refpurpose>reframes with new boundaries the current or a given set of axes
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
             <varlistentry>
                 <term>area</term>
                 <listitem>
-                    <para>row vector [xmin ymin xmax ymax] or
-                        [xmin ymin zmin xmax ymax zmax]: new bounds of the area
-                        to be replotted.
+                    <para>
+                        matrix <literal>[xmin xmax ; ymin ymax]</literal> or
+                        <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal>, or row
+                        <literal>[xmin ymin xmax ymax]</literal> or
+                        <literal>[xmin ymin zmin xmax ymax zmax]</literal>: new bounds of the area
+                        to be reframed.
                         <note>
                             <itemizedlist>
                                 <listitem>
         <para>
             <literal>replot</literal> is used to reframe the (set of) axes specified
             with <literal>idAxes</literal> -- or by default the current axes --
-            with new boundaries defined by
-            <literal>area = [xmin,ymin, xmax,ymax]</literal> or
-            <literal>area = [xmin,ymin,zmin, xmax,ymax,zmax]</literal>.
+            with new boundaries defined in 2D by
+            <literal>[xmin xmax ; ymin ymax]</literal> or
+            <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal>,
+            or in 3D by
+            <literal>[xmin ymin xmax ymax]</literal> or
+            <literal>[xmin ymin zmin xmax ymax zmax]</literal>.
         </para>
         <para>
             It changes the <literal>data_bounds</literal> attribute of processed axes.
index 9523270..a4f6f78 100644 (file)
             <varlistentry>
                 <term>area</term>
                 <listitem>
-                    <para>vecteur [xmin ymin xmax ymax] ou [xmin ymin zmin xmax ymax zmax]:
-                      nouvelles bornes de la zone à réafficher.
+                    <para>
+                        matrice <literal>[xmin xmax ; ymin ymax]</literal> ou
+                        <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal>, ou vecteur
+                        <literal>[xmin ymin xmax ymax]</literal> ou
+                        <literal>[xmin ymin zmin xmax ymax zmax]</literal>: nouvelles bornes de la
+                        zone à réafficher.
                       <note>
                             <itemizedlist>
                                 <listitem>
         <para>
             <literal>replot</literal> recadre les repères graphiques spécifiés
             par <literal>idAxes</literal> (ou par défaut le repère graphique actif)
-            en changeant leurs bornes spécifiées sous la forme
-            <literal>area = [xmin, ymin, xmax, ymax]</literal> ou
-            <literal>area = [xmin,ymin,zmin, xmax,ymax,zmax]</literal>.
+            en changeant leurs bornes spécifiées en 2D sous la forme
+            <literal>[xmin xmax ; ymin ymax]</literal> ou
+            <literal>[xmin ymin xmax ymax]</literal>, ou en 3D avec
+            <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal> ou
+            <literal>[xmin ymin zmin xmax ymax zmax]</literal>.
         </para>
         <para>
             <varname>replot</varname> modifie l'attribut
index a8dd01f..824c460 100644 (file)
                 <term>area</term>
                 <listitem>
                     <para>
-                        行ベクトル [xmin ymin xmax ymax] または
-                        [xmin ymin zmin xmax ymax zmax]: 再プロットされる領域の新しい範囲.
+                        matrix <literal>[xmin xmax ; ymin ymax]</literal> or
+                        <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal>, or row
+                        <literal>[xmin ymin xmax ymax]</literal> or
+                        <literal>[xmin ymin zmin xmax ymax zmax]</literal>:
+                        再プロットされる領域の新しい範囲.
                         <note>
                             <itemizedlist>
                                 <listitem>
         <para>
             <literal>replot</literal> is used to reframe the (set of) axes specified
             with <literal>idAxes</literal> -- or by default the current axes --
-            with new boundaries defined by
-            <literal>area = [xmin,ymin, xmax,ymax]</literal> or
-            <literal>area = [xmin,ymin,zmin, xmax,ymax,zmax]</literal>.
+            with new boundaries defined in 2D by
+            <literal>[xmin xmax ; ymin ymax]</literal> or
+            <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal>,
+            or in 3D by
+            <literal>[xmin ymin xmax ymax]</literal> or
+            <literal>[xmin ymin zmin xmax ymax zmax]</literal>.
         </para>
         <para>
             It changes the <literal>data_bounds</literal> attribute of processed axes.
index 9979df2..4ef2e20 100644 (file)
             <varlistentry>
                 <term>area</term>
                 <listitem>
-                    <para>row vector [xmin ymin xmax ymax] or
-                        [xmin ymin zmin xmax ymax zmax]: new bounds of the area
-                        to be replotted.
+                    <para>
+                        matrix <literal>[xmin xmax ; ymin ymax]</literal> or
+                        <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal>, or row
+                        <literal>[xmin ymin xmax ymax]</literal> or
+                        <literal>[xmin ymin zmin xmax ymax zmax]</literal>: new bounds of the area
+                        to be reframed.
                         <note>
                             <itemizedlist>
                                 <listitem>
         <para>
             <literal>replot</literal> is used to reframe the (set of) axes specified
             with <literal>idAxes</literal> -- or by default the current axes --
-            with new boundaries defined by
-            <literal>area = [xmin,ymin, xmax,ymax]</literal> or
-            <literal>area = [xmin,ymin,zmin, xmax,ymax,zmax]</literal>.
+            with new boundaries defined in 2D by
+            <literal>[xmin xmax ; ymin ymax]</literal> or
+            <literal>[xmin xmax ; ymin ymax ; zmin zmax]</literal>,
+            or in 3D by
+            <literal>[xmin ymin xmax ymax]</literal> or
+            <literal>[xmin ymin zmin xmax ymax zmax]</literal>.
         </para>
         <para>
             It changes the <literal>data_bounds</literal> attribute of processed axes.
index 5a32b29..4cb1c61 100644 (file)
@@ -1344,9 +1344,9 @@ msgid ""
 "(value => color#), with SCALED AXES\n"
 "(here is a part of the Mandelbrot set)"
 msgstr ""
-"Matplit1(..) affiche une matrice\n"
-"(value => color#), avec SCALED AXES\n"
-"(c'est ici une partie de l'ensemble de Mandelbrot)"
+"Matplot1(..) affiche une matrice\n"
+"(valeur => n° de couleur), avec des axes gradués\n"
+"(ici une partie de l'ensemble de Mandelbrot)"
 
 msgid "Real part"
 msgstr "Partie réelle"
index da848fa..dfed963 100644 (file)
             <varlistentry>
                 <term>X</term>
                 <listitem>
-                    <para>a matrix of floats or integers.</para>
+                    <para>
+                      a matrix of decimal numbers or encoded integers.
+                      Complex numbers not supported.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index 2c3b7a5..1f50b9b 100644 (file)
@@ -14,7 +14,9 @@
             <varlistentry>
                 <term>X  </term>
                 <listitem>
-                    <para>matrice de flottants ou d'entiers
+                    <para>
+                      matrice de nombres décimaux ou d'entiers encodés. Les nombres complexes ne
+                      sont pas acceptés.
                     </para>
                 </listitem>
             </varlistentry>
index ced5838..9e53fc1 100644 (file)
@@ -28,7 +28,7 @@
             <varlistentry>
                 <term>X</term>
                 <listitem>
-                    <para>浮動小数点数または整数の行列</para>
+                    <para>浮動小数点数または整数の行列. Complex numbers are not accepted.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index 7c6fdbc..e24b76e 100644 (file)
@@ -21,7 +21,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>y=iconvert(X,itype)</synopsis>
+        <synopsis>y = iconvert(X, itype)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
@@ -29,7 +29,9 @@
             <varlistentry>
                 <term>X</term>
                 <listitem>
-                    <para>matriz de floats ou inteiros </para>
+                    <para>matriz de números decimais ou inteiros codificados. Os números complexos
+                      não são aceitos
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index bbe8f1f..002927d 100644 (file)
@@ -28,7 +28,9 @@
             <varlistentry>
                 <term>X</term>
                 <listitem>
-                    <para>матрица чисел с плавающей запятой или целых чисел.</para>
+                    <para> матрица десятичных чисел или кодированных целых чисел.
+                      Комплексные числа не поддерживаются.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index 121c4bc..6b503f8 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: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="file" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="file" xml:lang="en">
     <refnamediv>
         <refname>file</refname>
         <refpurpose>file management</refpurpose>
@@ -338,6 +341,9 @@ mclose(u2);
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="isfile">isfile</link>
+            </member>
+            <member>
                 <link linkend="save">save</link>
             </member>
             <member>
index 3d4ac22..de7cc95 100644 (file)
@@ -77,9 +77,9 @@
             read character strings (the result is a character string column
             vector). In this case n must be equal to 1.
         </para>
-        <para>
-            <warning>Warning: The character strings are truncated when they are longuer than 4093.</warning>
-        </para>
+        <warning>
+          The character strings are truncated when they are longuer than 4093.
+        </warning>
         <para>
             Examples for <literal>format</literal>:
         </para>
         <para>
             To read on the keyboard use <literal>read(%io(1),...)</literal>.
         </para>
-    </refsection>
-    <refsection>
-        <title>Remark</title>
-        <para>
+        <note>
             Last line of data files must be terminated by a newline to be taken into account.
-        </para>
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
index 2093106..728b8aa 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: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="file" 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="file" xml:lang="ja">
     <refnamediv>
         <refname>file</refname>
         <refpurpose>ファイル管理</refpurpose>
@@ -328,6 +331,9 @@ mclose(u2);
         <title>参照</title>
         <simplelist type="inline">
             <member>
+                <link linkend="isfile">isfile</link>
+            </member>
+            <member>
                 <link linkend="save">save</link>
             </member>
             <member>
index 00071a9..659bbd4 100644 (file)
@@ -20,7 +20,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>[x]=read(file-desc,m,n,[format])
+        <synopsis>x = read(file-desc,m,n,[format])
             [x]=read(file-desc,m,n,k,format)
         </synopsis>
     </refsynopsisdiv>
             キーボードから読み込むには,
             <literal>read(%io(1),...)</literal>を使用してください.
         </para>
-    </refsection>
-    <refsection>
-        <title>注意</title>
-        <para>
-            データファイルの最後の行は,
-            認識されるために,改行で終わる必要があります.
-        </para>
+        <note>
+            データファイルの最後の行は,  認識されるために,改行で終わる必要があります.
+        </note>
     </refsection>
     <refsection>
         <title>例</title>
index fc9fe09..d412e6d 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: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="file" 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: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="file" xml:lang="pt">
     <refnamediv>
         <refname>file</refname>
         <refpurpose>Gerenciamento de arquivos</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[unit [,err]]=file('open', file-name [,status] [,access [,recl]] [,format])
             file(action,unit)
             [units [,typ [,nams [,mod [,swap]]]]] = file([unit])
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>file-name</term>
                         <varlistentry>
                             <term>"new"</term>
                             <listitem>
-                                <para>o arquivo não deve existir, novo arquivo (padrão)</para>
+                                <para>o arquivo não deve existir, novo arquivo (padrão)</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>"old"</term>
                             <listitem>
-                                <para>o arquivo já deve existir</para>
+                                <para>o arquivo já deve existir</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -60,7 +63,7 @@
                         <varlistentry>
                             <term>"scratch"</term>
                             <listitem>
-                                <para>o arquivo deve ser deletado ao fim da sessão</para>
+                                <para>o arquivo deve ser deletado ao fim da sessão</para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
@@ -74,7 +77,7 @@
                         <varlistentry>
                             <term>"sequential"</term>
                             <listitem>
-                                <para>acesso seqüencial (padrão)</para>
+                                <para>acesso seqüencial (padrão)</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                         <varlistentry>
                             <term>"formatted"</term>
                             <listitem>
-                                <para>para um arquivo formatado (padrão)</para>
+                                <para>para um arquivo formatado (padrão)</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>"unformatted"</term>
                             <listitem>
-                                <para>registro binário</para>
+                                <para>registro binário</para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
             <varlistentry>
                 <term>recl</term>
                 <listitem>
-                    <para>inteiro, é o tamanho de registros quando
+                    <para>inteiro, é o tamanho de registros quando
                         <literal>access="direct"</literal>
                     </para>
                 </listitem>
             <varlistentry>
                 <term>unit</term>
                 <listitem>
-                    <para>inteiro, descritor de unidade lógica do arquivo aberto</para>
+                    <para>inteiro, descritor de unidade lógica do arquivo aberto</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>units</term>
                 <listitem>
-                    <para>vetor de inteiros, descritores de unidades lógicas dos
-                        arquivos abertos. As unidades 5 e 6 são reservadas pelo sistema para
-                        dispositivos de entrada e saída.
+                    <para>vetor de inteiros, descritores de unidades lógicas dos
+                        arquivos abertos. As unidades 5 e 6 são reservadas pelo sistema para
+                        dispositivos de entrada e saída.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>nams</term>
                 <listitem>
-                    <para>vetor de strings, endereços dos arquivos abertos.</para>
+                    <para>vetor de strings, endereços dos arquivos abertos.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>mod</term>
                 <listitem>
-                    <para>modo de abertura de arquivo. Formado por três dígitos
+                    <para>modo de abertura de arquivo. Formado por três dígitos
                         abc
                     </para>
                     <variablelist>
                                     <varlistentry>
                                         <term>a</term>
                                         <listitem>
-                                            <para>0 significa formatado e 1 não formatado
-                                                (binário)
+                                            <para>0 significa formatado e 1 não formatado
+                                                (binário)
                                             </para>
                                         </listitem>
                                     </varlistentry>
                                         <term>a</term>
                                         <listitem>
                                             <para>1 significa "r" (leitura), 2 significa "w"
-                                                (escrita) e 3 significa "a" (anexação)
+                                                (escrita) e 3 significa "a" (anexação)
                                             </para>
                                         </listitem>
                                     </varlistentry>
                                     <varlistentry>
                                         <term>b</term>
                                         <listitem>
-                                            <para>é 1 se o arquivo foi aberto pelo modo "+"
-                                                (atualização)
+                                            <para>é 1 se o arquivo foi aberto pelo modo "+"
+                                                (atualização)
                                             </para>
                                         </listitem>
                                     </varlistentry>
                                     <varlistentry>
                                         <term>c</term>
                                         <listitem>
-                                            <para>é 1 se o arquivo foi aberto pelo modo "b"
-                                                (binário)
+                                            <para>é 1 se o arquivo foi aberto pelo modo "b"
+                                                (binário)
                                             </para>
                                         </listitem>
                                     </varlistentry>
             <varlistentry>
                 <term>swap</term>
                 <listitem>
-                    <para>alavanca de troca automática. swap=1 se a troca automática
-                        estiver ativada. swap é sempre 0 para arquivos Fortran.
+                    <para>alavanca de troca automática. swap=1 se a troca automática
+                        estiver ativada. swap é sempre 0 para arquivos Fortran.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>err</term>
                 <listitem>
-                    <para>inteiro, número de mensagem de erro (ver error), se a abertura
+                    <para>inteiro, número de mensagem de erro (ver error), se a abertura
                         falha. Se err for omitido, uma mensagem de erro aparece.
                     </para>
                 </listitem>
             <varlistentry>
                 <term>action</term>
                 <listitem>
-                    <para>é um dos seguintes strings:</para>
+                    <para>é um dos seguintes strings:</para>
                     <variablelist>
                         <varlistentry>
                             <term>"close"</term>
                             <listitem>
                                 <para>fecha os arquivos fornecidos pelos descritores de
-                                    unidades lógicas fornecidos em <literal>units</literal>
+                                    unidades lógicas fornecidos em <literal>units</literal>
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>"rewind"</term>
                             <listitem>
-                                <para>coloca o ponteiro no início do arquivo</para>
+                                <para>coloca o ponteiro no início do arquivo</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>"backspace"</term>
                             <listitem>
-                                <para>coloca o ponteiro no início do último registro.</para>
+                                <para>coloca o ponteiro no início do último registro.</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>"last"</term>
                             <listitem>
-                                <para>coloca o ponteiro após o último registro.</para>
+                                <para>coloca o ponteiro após o último registro.</para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            Seleciona uma unidade lógica <literal>unit</literal> e gerencia o
+            Seleciona uma unidade lógica <literal>unit</literal> e gerencia o
             arquivo <literal>file-name</literal>.
         </para>
         <para>
                 [,recl]][,format])
             </literal>
             permite abrir um arquivo com propriedades
-            especificadas e obter o número de unidade associado
-            <literal>unit</literal>. Este número de unidade pode ser utilizado para
-            ações futuras no arquivo, ou como descritor de arquivo em chamadas às
-            funções <literal>read</literal>, <literal>write</literal>,
+            especificadas e obter o número de unidade associado
+            <literal>unit</literal>. Este número de unidade pode ser utilizado para
+            ações futuras no arquivo, ou como descritor de arquivo em chamadas às
+            funções <literal>read</literal>, <literal>write</literal>,
             <literal>readb</literal>,
             <literal>writb</literal>,<literal>save</literal>,
             <literal>load</literal>.
             mover o ponteiro do arquivo corrente.
         </para>
         <para>
-            <literal>file()</literal> retorna os descritores de unidades lógicas
+            <literal>file()</literal> retorna os descritores de unidades lógicas
             dos arquivos abertos. So <literal>file('close',file() )</literal> fecha
-            todos os arquivos do usuário abertos (tipo C ou Fortran).
+            todos os arquivos do usuário abertos (tipo C ou Fortran).
         </para>
     </refsection>
     <refsection>
@@ -316,9 +319,12 @@ mclose(u2);
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
+                <link linkend="isfile">isfile</link>
+            </member>
+            <member>
                 <link linkend="save">save</link>
             </member>
             <member>
index 1bc4517..b4eb253 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) XXXX-2008 - INRIA
         <refpurpose>Leitura de matrizes</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[x]=read(file-desc,m,n,[format])
             [x]=read(file-desc,m,n,k,format)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>file-desc</term>
                 <listitem>
                     <para>string especificando o nome do arquivo ou valor inteiro
-                        especificando uma unidade lógica (fortran)(ver  <link linkend="file">file</link>).
+                        especificando uma unidade lógica (fortran)(ver  <link linkend="file">file</link>).
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>m, n</term>
                 <listitem>
-                    <para>inteiros (dimensões da matriz x). Ajuste m=-1 se você
-                        desconhece o número de linhas, para que todo o arquivo seja
+                    <para>inteiros (dimensões da matriz x). Ajuste m=-1 se você
+                        desconhece o número de linhas, para que todo o arquivo seja
                         lido.
                     </para>
                 </listitem>
@@ -49,9 +49,9 @@
                 <term>format</term>
                 <listitem>
                     <para>string, especifica um formato "Fortran". Este string deve
-                        começar com um parêntese direito e terminar com um parêntese
-                        esquerdo. Formatos não podem misturar pontos flutuantes, inteiros ou
-                        modo de edição de caractere
+                        começar com um parêntese direito e terminar com um parêntese
+                        esquerdo. Formatos não podem misturar pontos flutuantes, inteiros ou
+                        modo de edição de caractere
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            Lê linha após linha a matriz x <literal>mxn</literal>
+            Lê linha após linha a matriz x <literal>mxn</literal>
             (<literal>n=1</literal> para cadeia de caracteres) no arquivo
             <literal>file-desc</literal> (string ou inteiro). Cada linha da matriz
-            <literal>x</literal> começa em uma nova linha do arquivo
+            <literal>x</literal> começa em uma nova linha do arquivo
             <literal>file-desc</literal>. Dependendo de <literal>format</literal>, uma
             dada linha da matriz <literal>x</literal> pode ser lida de mais de uma
             linha do arquivo <literal>file-desc</literal>.
         </para>
-        <para>O tipo do resultado dependerá do formato especificado. Se format
-            contém apenas os descritores <literal>(d,e,f,g)</literal> a função tenta
-            ler dados numéricos (o resultado é uma matriz de números reais).
+        <para>O tipo do resultado dependerá do formato especificado. Se format
+            contém apenas os descritores <literal>(d,e,f,g)</literal> a função tenta
+            ler dados numéricos (o resultado é uma matriz de números reais).
         </para>
         <para>
-            Se format contém apenas o descritor <literal>a</literal> a função
-            tenta ler strings (o resultado é um vetor coluna de strings). Neste caso,
-            n deve ser igual a 1. Aviso: Os strings serão truncados se tiverem tamanho
+            Se format contém apenas o descritor <literal>a</literal> a função
+            tenta ler strings (o resultado é um vetor coluna de strings). Neste caso,
+            n deve ser igual a 1. Aviso: Os strings serão truncados se tiverem tamanho
             maior que 4093.
         </para>
         <para>
 (1x,e10.3,5x,3(f3.0))
 (10x,a20)
  ]]></programlisting>
-        <para>Quando format é o omitido, os dados são lidos utilizando-se o
-            formato numérico livre: espaços em branco, vírgulas e barras podem ser
+        <para>Quando format é o omitido, os dados são lidos utilizando-se o
+            formato numérico livre: espaços em branco, vírgulas e barras podem ser
             utilizados como separadores de dados, n*v pode ser utilizado para
-            representar n ocorrências do valor n.
+            representar n ocorrências do valor n.
         </para>
-        <para>Um arquivo de acesso direto pode ser utilzado na presença de um
-            parâmetro <literal>k</literal> que é um vetor de números de gravações a
-            serem lidas (uma gravação por linha), logo <literal>m</literal> deve ser
+        <para>Um arquivo de acesso direto pode ser utilzado na presença de um
+            parâmetro <literal>k</literal> que é um vetor de números de gravações a
+            serem lidas (uma gravação por linha), logo <literal>m</literal> deve ser
             <literal>m=prod(size(k))</literal>.
         </para>
         <para>
             Para ler no teclado use <literal>read(%io(1),...)</literal>.
         </para>
-    </refsection>
-    <refsection>
-        <title>Observação</title>
-        <para>A última linha de cada arquivo de dados devemser terminada por uma
+        <note>
+            A última linha de cada arquivo de dados devemser terminada por uma
             nova linha (newline) a ser levada em conta.
-        </para>
+        </note>
     </refsection>
     <refsection>
         <title>Exemplos</title>
@@ -119,11 +117,11 @@ A = rand(3,5);
 write(TMPDIR + '/foo', A);
 B = read(TMPDIR + '/foo', 3, 5);
 B = read(TMPDIR + '/foo', -1, 5);
-read(%io(1), 1, 1, '(a)')  // espera por entrada do usuário
+read(%io(1), 1, 1, '(a)')  // espera por entrada do usuário
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="file">file</link>