help pages: misc. typos + indent + small improvements 64/19464/20
Samuel GOUGEON [Sat, 7 Oct 2017 20:43:17 +0000 (22:43 +0200)]
 * datatip_properties: improving the order of properties; adding
   .detached_position; updating the history.
 * polyline_properties: adding/describing .datatip_display_mode.
   Updating the history.
 * typeof: adding typeof defined and used by Xcos
 * uigetfile, uiputfile, uigetfont: unfolding synopses. + infos about
   multiple masks. Typos and indentation.
 * xstring: synopses unfolded. See also improved.
 * makecell: See also improved
 * zeros: repmat(0, sizes) trick added
 * ones: repmat(1, sizes) trick added

Change-Id: Icb88fdcc3b9b967245c96e07db44223c21111d3b

50 files changed:
scilab/CHANGES.md
scilab/modules/core/help/en_US/1_keywords/brackets.xml
scilab/modules/core/help/fr_FR/1_keywords/brackets.xml
scilab/modules/data_structures/help/en_US/cells/makecell.xml
scilab/modules/data_structures/help/en_US/typeof.xml
scilab/modules/data_structures/help/fr_FR/typeof.xml
scilab/modules/data_structures/help/ja_JP/cells/makecell.xml
scilab/modules/data_structures/help/pt_BR/typeof.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/ones.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/zeros.xml
scilab/modules/elementary_functions/help/en_US/matrixmanipulation/cat.xml [moved from scilab/modules/elementary_functions/help/en_US/cat.xml with 89% similarity]
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/ndgrid.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/ones.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/zeros.xml
scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/ones.xml
scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/zeros.xml
scilab/modules/elementary_functions/help/ja_JP/matrixmanipulation/cat.xml [moved from scilab/modules/elementary_functions/help/ja_JP/cat.xml with 90% similarity]
scilab/modules/elementary_functions/help/pt_BR/elementarymatrices/ndgrid.xml
scilab/modules/elementary_functions/help/pt_BR/elementarymatrices/ones.xml
scilab/modules/elementary_functions/help/pt_BR/elementarymatrices/zeros.xml
scilab/modules/elementary_functions/help/pt_BR/matrixmanipulation/cat.xml [moved from scilab/modules/elementary_functions/help/pt_BR/cat.xml with 66% similarity]
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/ndgrid.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/ones.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/zeros.xml
scilab/modules/elementary_functions/help/ru_RU/matrixmanipulation/cat.xml [moved from scilab/modules/elementary_functions/help/ru_RU/cat.xml with 83% similarity]
scilab/modules/functions/help/en_US/whereis.xml
scilab/modules/graphics/help/en_US/datatips/datatip_properties.xml
scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
scilab/modules/graphics/help/en_US/text/xstring.xml
scilab/modules/graphics/help/fr_FR/text/xstring.xml
scilab/modules/graphics/help/ja_JP/datatips/datatip_properties.xml
scilab/modules/graphics/help/ja_JP/polygon/polyline_properties.xml
scilab/modules/graphics/help/ja_JP/text/xstring.xml
scilab/modules/graphics/help/pt_BR/datatips/datatip_properties.xml
scilab/modules/graphics/help/pt_BR/text/xstring.xml
scilab/modules/gui/help/en_US/uigetdir.xml
scilab/modules/gui/help/en_US/uigetfile.xml
scilab/modules/gui/help/en_US/uigetfont.xml
scilab/modules/gui/help/en_US/uiputfile.xml
scilab/modules/gui/help/ja_JP/uigetdir.xml
scilab/modules/gui/help/ja_JP/uigetfile.xml
scilab/modules/gui/help/ja_JP/uigetfont.xml
scilab/modules/gui/help/ja_JP/uiputfile.xml
scilab/modules/randlib/help/en_US/grand.xml
scilab/modules/randlib/help/fr_FR/grand.xml
scilab/modules/randlib/help/ja_JP/grand.xml
scilab/modules/randlib/help/ru_RU/grand.xml
scilab/modules/string/help/pt_BR/evstr.xml
scilab/modules/string/help/pt_BR/strcmp.xml
scilab/modules/string/help/pt_BR/strcmpi.xml

index fada18e..d345210 100644 (file)
@@ -234,7 +234,8 @@ 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`, `ieee`, `evstr`
+  `scilab|scilex`, `flipdim`, `Matplot_properties`, `meshgrid`, `ismatrix`, `xget`, `xset`, `ieee`, `evstr`,
+  `uigetfont`, `uigetdir`, `uigetfile`, `uiputfile`, `cat`, `makecell`, `xstring`
 * rewritten: `consolebox`, `double`, `isoview`, `pixel_drawing_mode`, `householder`, `or`, `|,||`,
 `and`, `&,&&`, `format`, `typeof`, `brackets`, `setlanguage`, `sleep`, `isinf`,
 `bitor`, `bitxor`, `bitand`, `macr2tree`, `geomean`, `clf`, `getPreferencesValue`, `gcd`, `isglobal`, `whereis`, `mode`
index 597368c..3bc77c5 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="brackets">
+<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="brackets">
     <refnamediv>
         <refname>brackets [,;]</refname>
         <refpurpose>Concatenation. Recipients of an assignment. Results of a function</refpurpose>
                             </warning>
                         </listitem>
                         <listitem>
-                            Arrays of structures with same fields.  Fields may be in different
-                            orders from an array to other ones.
+                            Arrays of cells.
                         </listitem>
                         <listitem>
-                            Arrays of cells.
+                            Arrays of structures with same fields.  Fields may be in different
+                            orders from an array to other ones.
                         </listitem>
                         <listitem>
                             Typed lists of type <link linkend="syslin">syslin</link>.
                 <term>M, Mh, Mv</term>
                 <listitem>
                     <para>
-                        Matrices or arrays with the type of all <varname>m##</varname>
-                        (if they all have the same data type)
+                        Matrices with the type of all <varname>m##</varname>
+                        (if they all have the same data type).
+                        cells arrays (if <literal>mi</literal> are so).
+                        structures arrays (if <literal>mi</literal> are so).
                     </para>
                 </listitem>
             </varlistentry>
                             </itemizedlist>
                         </para>
                     </refsect3>
+                    <para/>
+                    <refsect3>
+                        <title>Extensions</title>
+                        <para>
+                          <itemizedlist>
+                            <listitem>
+                              To concatenate simple lists, please use <link linkend="lstcat">lstcat</link>.
+                            </listitem>
+                            <listitem>
+                              To stack vectors or matrices over some dimension > 2 to build a
+                              N-dimensional array, please use <link linkend="cat">cat</link>.
+                            </listitem>
+                          </itemizedlist>
+                        </para>
+                    </refsect3>
                 </listitem>
+                <para/>
             </varlistentry>
             <varlistentry>
                 <term>[] on left-hand side of a <literal>"="</literal> assignment</term>
@@ -323,7 +344,12 @@ v = [10 1/%z], typeof(v)
 [%F int8(5)]
 [int8(%pi) uint8(%e)]
 [int8(%pi) int16(%e)]
- ]]></programlisting>
+
+// Concatenation of cells arrays:
+c1 = {%pi %t};
+c2 = {%z "abc"};
+c = [[{%i} c1] ; [c2, {1/%z^2}]]  // comma mandatory, to not parse c2{1/%z^2}
+]]></programlisting>
 
         <para>
             <emphasis role="bold">Distributive assignments:</emphasis>
@@ -386,6 +412,9 @@ s.r([2 4 6])
                 <link linkend="parentheses">parentheses</link>
             </member>
             <member>
+                <link linkend="cat">cat</link>
+            </member>
+            <member>
                 <link linkend="lstcat">lstcat</link>
             </member>
             <member>
index 3d239fb..b911aba 100644 (file)
@@ -18,7 +18,7 @@
           xml:lang="fr" xml:id="brackets">
     <refnamediv>
         <refname>brackets [,;]</refname>
-        <refpurpose>Concatenation. Récipients d'une affectation. Résultats d'une function</refpurpose>
+        <refpurpose>Concaténation. Récipients d'une affectation. Résultats d'une function</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntaxe</title>
                             </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.
+                            Tableaux de cellules.
                         </listitem>
                         <listitem>
-                            Tableaux de cellules.
+                            Tableaux de structures ayant les mêmes champs. Les champs peuvent être
+                            dans des ordres différents d'un tableau à l'autre.
                         </listitem>
                         <listitem>
                             Listes de type <link linkend="syslin">syslin</link>
                 <term>M, Mh, Mv</term>
                 <listitem>
                     <para>
-                        Matrices ou tableaux ayant le type des éléments <varname>m##</varname>
+                        Matrices ayant le type des éléments <varname>m##</varname>
                         (s'ils ont tous le même type).
+                        Tableaux de cellules (si les <literal>mi</literal> en sont).
+                        Tableaux de structures (si les <literal>mi</literal> en sont).
                     </para>
                 </listitem>
             </varlistentry>
                             </itemizedlist>
                         </para>
                     </refsect3>
+                    <para/>
+                    <refsect3>
+                        <title>Extensions</title>
+                        <para>
+                          <itemizedlist>
+                            <listitem>
+                              Pour concaténer des listes simples, utiliser <link linkend="lstcat">lstcat</link>.
+                            </listitem>
+                            <listitem>
+                              Pour assembler des vecteurs ou matrices ou hypermatrices ou autres
+                              tableaux selon une dimension > 2 et construire un hypertableau à N
+                              dimensions, utiliser <link linkend="cat">cat</link>.
+                            </listitem>
+                          </itemizedlist>
+                        </para>
+                    </refsect3>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -346,6 +364,11 @@ v = [10 1/%z], typeof(v)
 [%F int8(5)]
 [int8(%pi) uint8(%e)]
 [int8(%pi) int16(%e)]
+
+// Concaténation de tableaux de cellules :
+c1 = {%pi %t};
+c2 = {%z "abc"};
+c = [[{%i} c1] ; [c2, {1/%z^2}]]  // virgule obligatoire sinon c2{1/%z^2} => erreur
  ]]></programlisting>
 
         <para>
@@ -411,6 +434,9 @@ s.r([2 4 6])
                 <link linkend="parentheses">parentheses</link>
             </member>
             <member>
+                <link linkend="cat">cat</link>
+            </member>
+            <member>
                 <link linkend="lstcat">lstcat</link>
             </member>
             <member>
index e5e7eb2..d5db314 100644 (file)
@@ -72,6 +72,18 @@ makecell([2,3],1,2,3,'x','y','z')
             <member>
                 <link linkend="cell">cell</link>
             </member>
+            <member>
+                <link linkend="matrix">matrix</link>
+            </member>
+            <member>
+                <link linkend="size">size</link>
+            </member>
+            <member>
+                <link linkend="brackets">brackets [..]</link>
+            </member>
+            <member>
+                <link linkend="cat">cat</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 59af735..04a6604 100644 (file)
@@ -2,7 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * Copyright (C) 2015 - 2016 - Samuel GOUGEON
+ * Copyright (C) 2015 - 2017 - Samuel GOUGEON
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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="typeof" 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="typeof" xml:lang="en">
     <refnamediv>
         <refname>typeof</refname>
         <refpurpose>explicit type or overloading code of an object</refpurpose>
                     uitree feature. See for instance <link linkend="uiCreateNode">uiCreateNode</link>.
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                  <emphasis role="bold italic">Reserved T-list types used in Xcos</emphasis> :
+                </td>
+            </tr>
+            <tr>
+                <td>
+                  <link linkend="scicos_block"><emphasis role="bold">Block</emphasis></link>
+                </td>
+                <td><varname>object</varname> is a Xcos block.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_cpr"><emphasis role="bold">cpr</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing the compilation results of a Xcos diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_diagram"><emphasis role="bold">diagram</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist defining a Xcos diagram: initial parameters,
+                set of blocks, of links between blocks, and of Text labels belonging to the diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_graphics"><emphasis role="bold">graphics</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist assigned to the <literal>.graphics</literal>
+                field of a block.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_link"><emphasis role="bold">Link</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist defining and configuring a link between 2 blocks.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_model"><emphasis role="bold">model</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist assigned to the <literal>.model</literal> field
+                of a block.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_params"><emphasis role="bold">params</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing some configuration parameters of a
+                Xcos diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <emphasis role="bold">scsopt</emphasis>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing the graphical options of the Xcos
+                diagram editor.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_sim"><emphasis role="bold">scs</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing static results of the compilation of
+                a Xcos diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_state"><emphasis role="bold">xcs</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing dynamical results during a Xcos
+                simulation.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <emphasis role="bold">Text</emphasis>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist defining a text label in a Xcos diagram.
+              </td>
+            </tr>
         </table>
     </refsection>
     <refsection role="examples">
index 1431acb..8f96ecf 100644 (file)
@@ -2,7 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * Copyright (C) 2015 - 2016 - Samuel GOUGEON
+ * Copyright (C) 2015 - 2017 - Samuel GOUGEON
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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="typeof" xml:lang="fr">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="typeof" xml:lang="fr">
     <refnamediv>
         <refname>typeof</refname>
         <refpurpose>type explicite ou code de surcharge d'un objet Scilab</refpurpose>
                     <link linkend="uiCreateNode">uiCreateNode</link>.
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                  <emphasis role="bold italic">Types de T-list réservés utilisés par Xcos</emphasis> :
+                </td>
+            </tr>
+            <tr>
+                <td>
+                  <link linkend="scicos_block"><emphasis role="bold">Block</emphasis></link>
+                </td>
+                <td><varname>object</varname> est un bloc Xcos.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_cpr"><emphasis role="bold">cpr</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> est une liste contenant les résultats de la compilation
+                d'un schéma Xcos.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_diagram"><emphasis role="bold">diagram</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> est une liste définissant un schéma Xcos : paramètres
+                initiaux, références  aux blocs, liens interbloc et étiquettes texte le composant...
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_graphics"><emphasis role="bold">graphics</emphasis></link>
+              </td>
+              <td><varname>object</varname> est une liste affectée au champ
+                  <literal>.graphics</literal> d'un bloc.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_link"><emphasis role="bold">Link</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> est une liste définissant et paramétrant un lien entre 2
+                blocs Xcos.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_model"><emphasis role="bold">model</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> est une liste affectée au champ <literal>.model</literal>
+                d'un bloc.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_params"><emphasis role="bold">params</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> est une liste contenant les paramètres de configuration
+                d'un schéma Xcos.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <emphasis role="bold">scsopt</emphasis>
+              </td>
+              <td>
+                <varname>object</varname> est une liste contenant les options graphiques
+                d'édition d'un schéma Xcos.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_sim"><emphasis role="bold">scs</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> est une liste contenant les résultats statiques de la
+                compilation d'un schéma Xcos.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_state"><emphasis role="bold">xcs</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> est une liste contenant les résultats dynamiques
+                évoluant au cours d'une simulation Xcos.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <emphasis role="bold">Text</emphasis>
+              </td>
+              <td>
+                <varname>object</varname> est une liste définissant une étiquette de texte dans
+                un schéma Xcos.
+              </td>
+            </tr>
         </table>
     </refsection>
     <refsection role="examples">
index fff83ff..dde42c5 100644 (file)
  * along with this program.
     *
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="makecell">
+<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="makecell">
     <refnamediv>
         <refname>makecell</refname>
         <refpurpose>セル配列を作成. </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>s = makecell(dims,a1,a2,...an)</synopsis>
+        <synopsis>s = makecell(dims, a1,a2,...an)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
+        <para>All output arguments are optional, provided that their order is kept.</para>
         <variablelist>
             <varlistentry>
                 <term>dims</term>
@@ -73,6 +77,18 @@ makecell([2,3],1,2,3,'x','y','z')
             <member>
                 <link linkend="cell">cell</link>
             </member>
+            <member>
+                <link linkend="matrix">matrix</link>
+            </member>
+            <member>
+                <link linkend="size">size</link>
+            </member>
+            <member>
+                <link linkend="brackets">brackets [..]</link>
+            </member>
+            <member>
+                <link linkend="cat">cat</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 3b9a251..8f0918f 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="typeof" 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="typeof" xml:lang="pt">
     <refnamediv>
         <refname>typeof</refname>
         <refpurpose>tipo do objeto</refpurpose>
                     uitree feature. See for instance <link linkend="uiCreateNode">uiCreateNode</link>.
                 </td>
             </tr>
+            <tr>
+                <td colspan="2">
+                  <emphasis role="bold italic">Reserved T-list types used in Xcos</emphasis> :
+                </td>
+            </tr>
+            <tr>
+                <td>
+                  <link linkend="scicos_block"><emphasis role="bold">Block</emphasis></link>
+                </td>
+                <td><varname>object</varname> is a Xcos block.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_cpr"><emphasis role="bold">cpr</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing the compilation results of a Xcos diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_diagram"><emphasis role="bold">diagram</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist defining a Xcos diagram: initial parameters,
+                set of blocks, of links between blocks, and of Text labels belonging to the diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_graphics"><emphasis role="bold">graphics</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist assigned to the <literal>.graphics</literal>
+                field of a block.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_link"><emphasis role="bold">Link</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist defining and configuring a link between 2 blocks.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_model"><emphasis role="bold">model</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist assigned to the <literal>.model</literal> field
+                of a block.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_params"><emphasis role="bold">params</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing some configuration parameters of a
+                Xcos diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <emphasis role="bold">scsopt</emphasis>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing the graphical options of the Xcos
+                diagram editor.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_sim"><emphasis role="bold">scs</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing static results of the compilation of
+                a Xcos diagram.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <link linkend="scicos_state"><emphasis role="bold">xcs</emphasis></link>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist containing dynamical results during a Xcos
+                simulation.
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <emphasis role="bold">Text</emphasis>
+              </td>
+              <td>
+                <varname>object</varname> is a tlist defining a text label in a Xcos diagram.
+              </td>
+            </tr>
         </table>
     </refsection>
     <refsection role="examples">
index a016045..69d6d67 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="ones" 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="ones" xml:lang="en">
     <refnamediv>
         <refname>ones</refname>
         <refpurpose>matrix made of ones</refpurpose>
                 </para>
             </listitem>
         </itemizedlist>
+        <note>
+           <literal>repmat(1, sizes)</literal> can be used to generate an array of ones with
+           <literal>sizes=[m1 m2 ..]</literal> given as a vector.
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
 ones(3)
 ones(3,3)
 ones(2,3,2)
+
+repmat(1, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index a8ee160..2ea49c6 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="zeros" 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="zeros" xml:lang="en">
     <refnamediv>
         <refname>zeros</refname>
         <refpurpose>matrix made of zeros</refpurpose>
                 </listitem>
             </varlistentry>
         </variablelist>
+        <note>
+           <literal>repmat(0, sizes)</literal> can be used to generate an array of zeros with
+           <literal>sizes=[m1 m2 ..]</literal> given as a vector.
+        </note>
         <para>
             If <literal>x</literal> is a <literal>syslin</literal> list (linear
             system in state-space or transfer form), <literal>zeros(x)</literal> is
 zeros(3)
 zeros(3,3)
 zeros(2,3,2)
+
+repmat(0, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
  * 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="cat" 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="cat" xml:lang="en">
     <refnamediv>
         <refname>cat</refname>
         <refpurpose>concatenate several arrays</refpurpose>
@@ -97,6 +100,12 @@ dims=3; A1=matrix(1:12,[2,2,3]); A2=[13 14;15 16]; A3=matrix(21:36,[2,2,4]); y=c
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="brackets">brackets [..]</link>
+            </member>
+            <member>
+                <link linkend="lstcat">lstcat</link>
+            </member>
+            <member>
                 <link linkend="permute">permute</link>
             </member>
             <member>
index 19fc75d..b19bbc6 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: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="ndgrid" xml:lang="fr">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org"  xml:id="ndgrid" xml:lang="fr">
     <refnamediv>
         <refname>ndgrid</refname>
         <refpurpose>construit des matrices ou hypermatrices en répliquant des vecteurs
@@ -8,6 +11,7 @@
     <refsynopsisdiv>
         <title>Séquences d'appel</title>
         <synopsis>
+            [X, Y] = ndgrid(x)
             [X, Y] = ndgrid(x,y)
             [X, Y, Z] = ndgrid(x,y,z)
             [X, Y, Z, T] = ndgrid(x,y,z,t)
index 3571e52..42eefc4 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: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="ones" xml:lang="fr">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="ones" xml:lang="fr">
     <refnamediv>
         <refname>ones</refname>
         <refpurpose>matrice remplie de 1</refpurpose>
                 </para>
             </listitem>
         </itemizedlist>
+        <note>
+           <literal>repmat(1, sizes)</literal> peut être utilisé pour créer un tableau de uns dont
+           les dimensions sont données dans un vecteur <literal>sizes=[m1 m2 ..]</literal>.
+        </note>
     </refsection>
     <refsection>
         <title>Exemples</title>
 ones(3)
 ones(3,3)
 ones(2,3,2)
+
+repmat(1, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 061fea8..f43dc55 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: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="zeros" xml:lang="fr">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="zeros" xml:lang="fr">
     <refnamediv>
         <refname>zeros</refname>
         <refpurpose>matrice nulle</refpurpose>
                 </listitem>
             </varlistentry>
         </variablelist>
-        <para>
-            Notez que <literal>zeros(3)</literal> est équivalent à
+        <warning>
+            <literal>zeros(3)</literal> est équivalent à
             <literal>zeros(a)</literal> avec <literal>a=3</literal> et donc n'est PAS
             une matrice 3x3 !
-        </para>
+        </warning>
         <para>zeros() est équivalent à zeros(1,1).</para>
+        <note>
+           <literal>repmat(0, sizes)</literal> peut être utilisé pour générer un tableau de zéros
+           dont les dimensions sont données dans un vecteur <literal>sizes=[m1 m2 ..]</literal>.
+        </note>
     </refsection>
     <refsection>
         <title>Exemples</title>
@@ -80,6 +87,8 @@
 zeros(3)
 zeros(3,3)
 zeros(2,3,2)
+
+repmat(0, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 69cc3ce..7d4a203 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="ones" 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="ones" xml:lang="ja">
 
     <refnamediv>
 
             </listitem>
 
         </itemizedlist>
+        <note>
+           <literal>repmat(1, sizes)</literal> can be used to generate an array of ones with
+           <literal>sizes=[m1 m2 ..]</literal> given as a vector.
+        </note>
 
     </refsection>
 
 ones(3)
 ones(3,3)
 ones(2,3,2)
+
+repmat(1, [2 4 2])
  ]]></programlisting>
 
     </refsection>
index a5ce0ca..d028ddd 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="zeros" 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="zeros" xml:lang="ja">
 
     <refnamediv>
 
             </varlistentry>
 
         </variablelist>
+        <note>
+           <literal>repmat(0, sizes)</literal> can be used to generate an array of zeros with
+           <literal>sizes=[m1 m2 ..]</literal> given as a vector.
+        </note>
 
         <para>
 
 zeros(3)
 zeros(3,3)
 zeros(2,3,2)
+
+repmat(0, [2 4 2])
  ]]></programlisting>
 
     </refsection>
  *
  -->
 
-<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="cat" 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="cat" xml:lang="ja">
 
     <refnamediv>
 
@@ -177,6 +180,12 @@ dims=3; A1=matrix(1:12,[2,2,3]); A2=[13 14;15 16]; A3=matrix(21:36,[2,2,4]); y=c
         <title>参照</title>
 
         <simplelist type="inline">
+            <member>
+                <link linkend="brackets">brackets [..]</link>
+            </member>
+            <member>
+                <link linkend="lstcat">lstcat</link>
+            </member>
 
             <member>
 
index d42e865..ab50b43 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="ndgrid" 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="ndgrid" xml:lang="pt">
 <refnamediv>
     <refname>ndgrid</refname>
     <refpurpose>constrói matrizes ou matrizes N-D, replicando alguns vetores dadas
@@ -8,6 +11,7 @@
 <refsynopsisdiv>
     <title>Seqüência de Chamamento</title>
     <synopsis>
+        [X, Y] = ndgrid(x)
         [X, Y] = ndgrid(x,y)
         [X, Y, Z] = ndgrid(x,y,z)
         [X, Y, Z, T] = ndgrid(x,y,z,t)
index f333329..263c3ca 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: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="ones" 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="ones" xml:lang="pt">
     <refnamediv>
         <refname>ones</refname>
         <refpurpose>matriz de entradas todas iguais a 1</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>y=ones(m1,m2,...)
             y=ones(x)
             y=ones()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>x,y</term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>Retorna uma matriz cujas entradas são todas iguais a 1. </para>
+        <title>Descrição</title>
+        <para>Retorna uma matriz cujas entradas são todas iguais a 1. </para>
         <variablelist>
             <varlistentry>
                 <term>ones(m1,m2)</term>
                 <listitem>
                     <para>
                         retorna uma matriz <literal>(m1,m2)</literal> cujas entradas
-                        são todas 1.
+                        são todas 1.
                     </para>
                 </listitem>
             </varlistentry>
                 <listitem>
                     <para>
                         retorna uma matriz <literal>(m1,m2,..,mn)</literal> cujas
-                        entradas são todas 1.
+                        entradas são todas 1.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>ones(x)</term>
                 <listitem>
-                    <para>retorna uma matriz cujas entradas são todas 1 com o mesmo
+                    <para>retorna uma matriz cujas entradas são todas 1 com o mesmo
                         tamanho que <literal>x</literal>.
                     </para>
                 </listitem>
                 <term>ones(x)</term>
                 <listitem>
                     <para>
-                        também é válido para <literal>x</literal> uma lista
+                        também é válido para <literal>x</literal> uma lista
                         <literal>syslin</literal> .
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
         <para>
-            Perceba que <literal>ones(3)</literal> é <literal>ones(a)</literal>
-            com <literal>a=3</literal> , i.e., NÃO é uma matriz 3x3!
+            Perceba que <literal>ones(3)</literal> é <literal>ones(a)</literal>
+            com <literal>a=3</literal> , i.e., NÃO é uma matriz 3x3!
         </para>
-        <para>ones() é equivalente a ones(1,1).</para>
+        <para>ones() é equivalente a ones(1,1).</para>
+        <note>
+           <literal>repmat(1, sizes)</literal> can be used to generate an array of ones with
+           <literal>sizes=[m1 m2 ..]</literal> given as a vector.
+        </note>
     </refsection>
     <refsection>
         <title>Exemplos</title>
 ones(3)
 ones(3,3)
 ones(2,3,2)
+
+repmat(1, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="eye">eye</link>
index eb8e2df..6fe54cd 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="zeros" 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="zeros" xml:lang="pt">
     <refnamediv>
         <refname>zeros</refname>
         <refpurpose>matriz feita de zeros</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>y=zeros()
             y=zeros(x)
             y=zeros(m1,m2,..)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>x,y</term>
@@ -43,8 +46,8 @@
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>Cria uma matriz de zeros (é o mesmo que
+        <title>Descrição</title>
+        <para>Cria uma matriz de zeros (é o mesmo que
             <literal>0*ones</literal>).
         </para>
         <variablelist>
@@ -77,7 +80,7 @@
                 <term>zeros(3)</term>
                 <listitem>
                     <para>
-                        é <literal>zeros(a)</literal> com <literal>a=3</literal> é uma
+                        é <literal>zeros(a)</literal> com <literal>a=3</literal> é uma
                         matriz 3x3!
                     </para>
                 </listitem>
             <varlistentry>
                 <term>zeros()</term>
                 <listitem>
-                    <para>retorna um único zero</para>
+                    <para>retorna um único zero</para>
                 </listitem>
             </varlistentry>
         </variablelist>
+        <note>
+           <literal>repmat(0, sizes)</literal> can be used to generate an array of zeros with
+           <literal>sizes=[m1 m2 ..]</literal> given as a vector.
+        </note>
         <para>
-            Se <literal>x</literal> é uma lista <literal>syslin</literal>
-            (sistema linear em forma de espaço de estados ou transferência),
-            <literal>zeros(x)</literal> também é válido e retorna uma matriz
+            Se <literal>x</literal> é uma lista <literal>syslin</literal>
+            (sistema linear em forma de espaço de estados ou transferência),
+            <literal>zeros(x)</literal> também é válido e retorna uma matriz
             nula.
         </para>
     </refsection>
 zeros(3)
 zeros(3,3)
 zeros(2,3,2)
+
+repmat(0, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="eye">eye</link>
  * 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="cat" 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="cat" xml:lang="pt">
     <refnamediv>
         <refname>cat</refname>
-        <refpurpose>concatena vários arrays</refpurpose>
+        <refpurpose>concatena vários arrays</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>y=cat(dims,A1,A2,...,An)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>dims</term>
@@ -35,8 +38,8 @@
                 <term>A1,A2,..An</term>
                 <listitem>
                     <para>escalares, vetores, matrizes, multi-arrays ou cell arrays. A1,
-                        A2, ..., An, devem ter o mesmo tamanho (excluindo o número de
-                        dimensão dims). size(A1,i)=size(A2,i)=...=size(An,i) para i
+                        A2, ..., An, devem ter o mesmo tamanho (excluindo o número de
+                        dimensão dims). size(A1,i)=size(A2,i)=...=size(An,i) para i
                         diferente de dims e size(A1,dims), size(A2,dims),...,size(An,dims)
                         podem ser diferentes
                     </para>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            <literal>y=cat(dims,A1,A2,...,An) :</literal> y é o resutado da
-            concatenação dos argumentos de entrada A1, A2, ..., An. Se dims= 1, então
-            a concatenação é feita de acordo com as linhas; se dims= 2, então a
-            concatenação é feita de acordo com as colunas dos argumentos de
+            <literal>y=cat(dims,A1,A2,...,An) :</literal> y é o resutado da
+            concatenação dos argumentos de entrada A1, A2, ..., An. Se dims= 1, então
+            a concatenação é feita de acordo com as linhas; se dims= 2, então a
+            concatenação é feita de acordo com as colunas dos argumentos de
             entrada.
         </para>
-        <para>Se dims= 1,então a concatenação é feita de acordo com as
+        <para>Se dims= 1,então a concatenação é feita de acordo com as
             linhas
         </para>
         <para>A1=[1 2 3 ; 4 5 6]; A2=[7 8 9 ; 10 11 12]; y=cat(1,A1,A2) =&gt; y=[1
             2 3 ; 4 5 6 ;7 8 9; 10 11 12]
         </para>
-        <para>Se dims= 2,então a concatenação é feita de acordo com as colunas dos
+        <para>Se dims= 2,então a concatenação é feita de acordo com as colunas dos
             argumentos de entrada
         </para>
         <para>A1=[1 2 3;4 5 6]; A2=[7 8 9 ;10 11 12]; y=cat(2,A1,A2) =&gt; y=[1 2
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-// primeiro exemplo: concatenação de acordo com as linhas
+// primeiro exemplo: concatenação de acordo com as linhas
 dims=1; A1=[1 2 3]; A2=[4 5 6 ; 7 8 9]; A3=[10 11 12]; y=cat(dims,A1,A2,A3)
 
-// segundo exemplo: concatenação de acordo com as colunas
+// segundo exemplo: concatenação de acordo com as colunas
 dims=2; A1=[1 2 3]'; A2=[4 5;7 8;9 10]; y=cat(dims,A1,A2)
 
-// terceiro exemplo concatenação de acordo com a terceira dimensão
+// terceiro exemplo concatenação de acordo com a terceira dimensão
 dims=3; A1=matrix(1:12,[2,2,3]); A2=[13 14;15 16]; A3=matrix(21:36,[2,2,4]); y=cat(dims,A1,A2,A3)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
+                <link linkend="brackets">brackets [..]</link>
+            </member>
+            <member>
+                <link linkend="lstcat">lstcat</link>
+            </member>
+            <member>
                 <link linkend="permute">permute</link>
             </member>
             <member>
index 937298f..9e2fd1d 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: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="ndgrid" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="ndgrid" xml:lang="ru">
 <refnamediv>
     <refname>ndgrid</refname>
     <refpurpose>строит матрицы или N-мерные массивы путем репликации данных векторов
@@ -8,7 +11,8 @@
 <refsynopsisdiv>
     <title>Синтаксис</title>
     <synopsis>
-        X, Y] = ndgrid(x,y)
+        [X, Y] = ndgrid(x)
+        [X, Y] = ndgrid(x,y)
         [X, Y, Z] = ndgrid(x,y,z)
         [X, Y, Z, T] = ndgrid(x,y,z,t)
         [X1, X2, ..., Xm] = ndgrid(x1,x2,...,xm)
index 0cfd8da..5aeb612 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="ones" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="ones" xml:lang="ru">
     <refnamediv>
         <refname>ones</refname>
         <refpurpose>матрица, составленная из единиц</refpurpose>
                 <term>ones(x)</term>
                 <listitem>
                     <para>
-                        является корректной для <literal>x</literal>, которая является списком           <literal>syslin</literal>.
+                        является корректной для <literal>x</literal>, которая является списком
+                        <literal>syslin</literal>.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
         <para>
-            Заметьте, что <literal>ones(3)</literal> это <literal>ones(a)</literal>, где <literal>a=3</literal>, т. е. это матрица размером НЕ 3x3!
+            Заметьте, что <literal>ones(3)</literal> это <literal>ones(a)</literal>, где
+            <literal>a=3</literal>, т. е. это матрица размером НЕ 3x3!
         </para>
-        <para>ones() эквивалентно ones(1,1).</para>
+      <para><literal>ones()</literal> эквивалентно <literal>ones(1,1)</literal>.</para>
+        <note>
+           <literal>repmat(1, sizes)</literal> может использоваться для формироваания массива из единиц
+           с <literal>sizes=[m1 m2 ..]</literal>, заданным в виде вектора.
+        </note>
     </refsection>
     <refsection>
         <title>Примеры</title>
 ones(3)
 ones(3,3)
 ones(2,3,2)
+
+repmat(1, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 08e9d46..404601c 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="zeros" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="zeros" xml:lang="ru">
     <refnamediv>
         <refname>zeros</refname>
         <refpurpose>матрица, составленная из нулей</refpurpose>
                 </listitem>
             </varlistentry>
         </variablelist>
+        <note>
+           <literal>repmat(0, sizes)</literal> может использоваться для формирования массива из нулей
+           с <literal>sizes=[m1 m2 ..]</literal>, заданным в виде вектора.
+        </note>
         <para>
-            Если <literal>x</literal> является списком <literal>syslin</literal> (линейная система в виде пространства состояний или передаточной форме), то <literal>zeros(x)</literal> так же является корректным и возвращает матрицу нулей.
+            Если <literal>x</literal> является списком <literal>syslin</literal> (линейная система
+            в виде пространства состояний или передаточной форме), то <literal>zeros(x)</literal>
+            так же является корректным и возвращает матрицу нулей.
         </para>
     </refsection>
     <refsection>
 zeros(3)
 zeros(3,3)
 zeros(2,3,2)
+
+repmat(0, [2 4 2])
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
  * 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="cat" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="cat" xml:lang="ru">
     <refnamediv>
         <refname>cat</refname>
         <refpurpose>конкатенация нескольких массивов</refpurpose>
             Если <literal>dims=1</literal>, то конкатенация проводится по строкам входных аргументов
         </para>
         <para>
-            <literal>A1=[1 2 3 ; 4 5 6]</literal>; <literal>A2=[7 8 9 ; 10 11 12]</literal>; <literal>y=cat(1,A1,A2)</literal>  =&gt; <literal>y=[1 2 3 ; 4 5 6 ;7 8 9; 10 11 12]</literal>.
+            <literal>A1=[1 2 3 ; 4 5 6]</literal>; <literal>A2=[7 8 9 ; 10 11 12]</literal>;
+           <literal>y=cat(1,A1,A2)</literal>  =&gt; <literal>y=[1 2 3 ; 4 5 6 ;7 8 9; 10 11 12]</literal>.
         </para>
         <para>
             Если <literal>dims=2</literal>, то конкатенация проводится по столбцам входных аргументов
         </para>
         <para>
-            <literal>A1=[1 2 3 ; 4 5 6]</literal>; <literal>A2=[7 8 9 ; 10 11 12]</literal>; <literal>y=cat(2,A1,A2)</literal> =&gt; <literal>y=[1 2
-                3 7 8 9 ; 4 5 6 10 11 12]
+            <literal>A1=[1 2 3 ; 4 5 6]</literal>; <literal>A2=[7 8 9 ; 10 11 12]</literal>;
+            <literal>y=cat(2,A1,A2)</literal> =&gt; <literal>y=[1 2 3 7 8 9 ; 4 5 6 10 11 12]
             </literal>
             .
         </para>
@@ -83,7 +87,7 @@ dims=1; A1=[1 2 3]; A2=[4 5 6 ; 7 8 9]; A3=[10 11 12]; y=cat(dims,A1,A2,A3)
 // второй пример: конкатенация по столбцам
 dims=2; A1=[1 2 3]'; A2=[4 5;7 8;9 10]; y=cat(dims,A1,A2)
 
-// третий пример: конкатенация то третьей размерности
+// третий пример: конкатенация по третьей размерности
 dims=3; A1=matrix(1:12,[2,2,3]); A2=[13 14;15 16]; A3=matrix(21:36,[2,2,4]); y=cat(dims,A1,A2,A3)
  ]]></programlisting>
     </refsection>
@@ -91,6 +95,12 @@ dims=3; A1=matrix(1:12,[2,2,3]); A2=[13 14;15 16]; A3=matrix(21:36,[2,2,4]); y=c
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
+                <link linkend="brackets">квадратные скобки [..]</link>
+            </member>
+            <member>
+                <link linkend="lstcat">lstcat</link>
+            </member>
+            <member>
                 <link linkend="permute">permute</link>
             </member>
             <member>
index 78583c6..bb1bfdf 100644 (file)
                         When this function is defined in a file, there is no way to retrieve the file
                         path and name.
                     </para>
+                    <para/>
                 </varlistentry>
                 <varlistentry>
                     <term>a builtin written and compiled in an external language (C, C++..):</term>
index 049cd27..c0d4c2b 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="datatip_properties">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="datatip_properties">
     <refnamediv>
         <refname>datatip properties</refname>
         <refpurpose>description of the Datatip
                 </listitem>
             </varlistentry>
             <varlistentry>
+                <term>interp_mode: </term>
+                <listitem>
+                    <para>This field sets the interpolation mode for tip location. Its value should be
+                        <literal>"on" </literal>(interpolation is made between mesh points) or <literal>"off"
+                        </literal>
+                        (the tips can only be located at the mesh points).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>box_mode: </term>
                 <listitem>
                     <para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>orientation: </term>
-                <listitem>
-                    <para>This field sets the position on the text box with respect to polyline point.
-                        The possible values are 0 (upper left), 1 (upper right), 2 (lower left), 3 (lower right), 4 (left), 5 (right),
-                        6 (upper) or 7 (lower).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>display_components: </term>
                 <listitem>
                     <para>
-                        This field controls which components are displayed. Its default value
-                        is <literal>"xy"</literal>for 2D views and <literal>"xyz"</literal> for 3D views.
-                        Possible values for this field are any combination of <literal>"x"</literal>, <literal>"y"</literal> and <literal>"z"</literal>.
-                        Some examples for this field are <literal>"zy"</literal>, <literal>"xzy"</literal>, <literal>"xz"</literal>, <literal>"y"</literal> and so on.
-                        PS: The components are drawn in the same order they are found in the string.
+                        This field controls which components are displayed. Its default value is
+                        <literal>"xy"</literal>for 2D views and <literal>"xyz"</literal> for 3D views.
+                        Possible values are any combination of <literal>"x"</literal>,
+                        <literal>"y"</literal> and <literal>"z"</literal>, like
+                        <literal>"zy"</literal>, <literal>"xzy"</literal>, <literal>"xz"</literal>,
+                        <literal>"y"</literal>, etc.
                     </para>
+                    <para>The components are drawn in the order they are found in the string.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>auto_orientation: </term>
+                <term>display_function: </term>
                 <listitem>
-                    <para>
-                        This field contains the default <literal>auto_orientation</literal> property
-                        value for the datatip. Its value should be <literal>"on" </literal>(automatic orientation)
-                        or <literal>"off"</literal> (no automatic orientation). In the <literal>"off"</literal> case,
-                        See <literal>orientation</literal> property.
+                    <para>See
+                        <literal>
+                            <link linkend="polyline_properties">polyline_properties</link>
+                        </literal>
+                        help page.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>interp_mode: </term>
+                <term>orientation: </term>
                 <listitem>
-                    <para>This field sets the interpolation mode for tip location. Its value should be
-                        <literal>"on" </literal>(interpolation is made between mesh points) or <literal>"off"
-                        </literal>
-                        (the tips can only be located at the mesh points).
+                    <para>This field sets the position on the text box with respect to polyline point.
+                        The possible values are 0 (upper left), 1 (upper right), 2 (lower left), 3 (lower right), 4 (left), 5 (right),
+                        6 (upper) or 7 (lower).
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>display_function: </term>
+                <term>auto_orientation: </term>
                 <listitem>
-                    <para>See
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        help page.
+                    <para>
+                        This field contains the default <literal>auto_orientation</literal> property
+                        value for the datatip. Its value should be <literal>"on" </literal>(automatic orientation)
+                        or <literal>"off"</literal> (no automatic orientation). In the <literal>"off"</literal> case,
+                        See <literal>orientation</literal> property.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>detached_position: </term>
                 <listitem>
                     <para>
-                        This field sets the position to draw the datatip text box. When its value  is <literal>[]</literal>
-                        the datatip text box is drawn attached to its anchor point in the polyline, if its value is a 3-components
-                        vector <literal>[x y z]</literal>, the text box is drawn in the given position.
+                      This field sets the position <literal>[x y z]</literal> of the bottom left
+                      corner of the datatip text box, even when the link to the polyline starts
+                      from another corner.  When its value  is <literal>[]</literal>,
+                      the datatip text box is drawn attached to its anchor point in the polyline.
+                    </para>
+                    <para>
+                      In detached mode, it is not possible to force the starting point of the link
+                      on the box frame. It is autoset.
                     </para>
                 </listitem>
             </varlistentry>
                     </para>
                 </revremark>
             </revision>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>
+                   <itemizedlist>
+                     <listitem>
+                       <para><literal>.z_component</literal> is removed.</para>
+                     </listitem>
+                     <listitem>
+                       <para>New <literal>.display_components</literal> property.</para>
+                     </listitem>
+                       <para>New <literal>.detached_position</literal> property.</para>
+                     <listitem>
+                     </listitem>
+                   </itemizedlist>
+                </revremark>
+            </revision>
         </revhistory>
     </refsection>
 </refentry>
index dc275c1..e082bb6 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="polyline_properties">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="polyline_properties">
     <refnamediv>
         <refname>polyline properties</refname>
         <refpurpose>description of the Polyline
                         type of mark to use when <literal>mark_mode</literal> property is
                         <literal>"on"</literal>. The value should be an integer in [0 14] which
                         stands for: dot, plus, cross, star, filled diamond, diamond, triangle
-                        up, triangle down, diamond plus, circle, asterisk, square, triangle
-                        right, triangle left and pentagram. The figure below shows the aspects of the marks depending on the <literal>mark_style</literal> and the <literal>mark_foreground</literal> and <literal>mark_background</literal> properties.
+                        up, triangle down, diamond plus, circle, asterisk, square, triangle right,
+                        triangle left and pentagram. The figure below shows the aspects of the marks
+                        depending on the <literal>mark_style</literal> and the
+                        <literal>mark_foreground</literal> and <literal>mark_background</literal>
+                        properties.
                     </para>
                     <para>
                         <inlinemediaobject>
                 <term>datatip_display_mode: </term>
                 <listitem>
                     <para>
-                        This field determines how the datatips are displayed. Its value can be <literal>always</literal>, 
-                        <literal>mouseclick</literal> or <literal>mouseover</literal>.
+                        The value can be one of the following:
+                        <itemizedlist>
+                          <listitem>
+                            <literal>"always"</literal>: the datatip is always displayed (default mode).
+                          </listitem>
+                          <listitem>
+                            <literal>"mouseclick"</literal>: clicking on the anchor of the datatip
+                             on the line toogles its display. The anchor is always displayed.
+                          </listitem>
+                          <listitem>
+                            <literal>"mouseover"</literal>: setting the mouse pointer over the
+                            datatip anchor on the line displays the datatip. When going away, the
+                            datatip is masked. Its anchor remains displayed.
+                          </listitem>
+                        </itemizedlist>
                     </para>
                 </listitem>
             </varlistentry>
@@ -548,7 +567,15 @@ f.children.y_label.font_size = 3;
         <revhistory>
             <revision>
                 <revnumber>5.4.0</revnumber>
-                <revremark>line_style value 0 is obsolete, use 1 instead (both are equivalent for SOLID). Using value 0 will produce an error in Scilab 5.4.1.</revremark>
+                <revremark>
+                  line_style value 0 is obsolete, use 1 instead (both are equivalent for  SOLID).
+                  Using value 0 will produce an error in Scilab 5.4.1.</revremark>
+            </revision>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>
+                  <para>New property <literal>.datatip_display_mode</literal> introduced.</para>
+                </revremark>
             </revision>
         </revhistory>
     </refsection>
index 2310116..9e9a50a 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="xstring">
+<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="xstring">
     <refnamediv>
         <refname>xstring</refname>
         <refpurpose>draw strings</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>xstring(x,y,str,[angle,[box]])</synopsis>
+        <synopsis>
+          xstring(x, y, str)
+          xstring(x, y, str, angle)
+          xstring(x, y, str, angle, box)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
@@ -116,19 +123,19 @@ gce().font_size = 24;
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="titlepage">titlepage</link>
+                <link linkend="text_properties">text_properties</link>
             </member>
             <member>
-                <link linkend="xnumb">xnumb</link>
+                <link linkend="math_rendering_features_in_graphic">Math mode in strings</link>
             </member>
-            <member>
-                <link linkend="xstringb">xstringb</link>
+          <member>
+                <link linkend="xnumb">xnumb</link>
             </member>
             <member>
-                <link linkend="xstringl">xstringl</link>
+                <link linkend="xtitle">xtitle</link>
             </member>
             <member>
-                <link linkend="xtitle">xtitle</link>
+                <link linkend="titlepage">titlepage</link>
             </member>
         </simplelist>
     </refsection>
index 4eef45e..de39774 100644 (file)
@@ -1,12 +1,19 @@
 <?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="xstring">
+<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="xstring">
     <refnamediv>
         <refname>xstring</refname>
         <refpurpose>dessine des chaînes de caractères  </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>xstring(x,y,str,[angle,[box]])</synopsis>
+        <synopsis>
+          xstring(x, y, str)
+          xstring(x, y, str, angle)
+          xstring(x, y, str, angle, box)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
@@ -102,19 +109,19 @@ gce().font_size = 24;  // un grand alpha
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="titlepage">titlepage</link>
+                <link linkend="text_properties">text_properties</link>
             </member>
             <member>
-                <link linkend="xnumb">xnumb</link>
+                <link linkend="math_rendering_features_in_graphic">Math mode in strings</link>
             </member>
-            <member>
-                <link linkend="xstringb">xstringb</link>
+          <member>
+                <link linkend="xnumb">xnumb</link>
             </member>
             <member>
-                <link linkend="xstringl">xstringl</link>
+                <link linkend="xtitle">xtitle</link>
             </member>
             <member>
-                <link linkend="xtitle">xtitle</link>
+                <link linkend="titlepage">titlepage</link>
             </member>
         </simplelist>
     </refsection>
index 5366e39..890f1de 100644 (file)
@@ -1,6 +1,9 @@
 <?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="datatip_properties">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ja" xml:id="datatip_properties">
 
     <refnamediv>
 
 
             <varlistentry>
 
+                <term>interp_mode: </term>
+
+                <listitem>
+
+                    <para>
+
+                        このフィールドはtipの位置の補間モードを指定します.
+
+                        この値は <literal>"on" </literal> (格子点間で補間を行う)または
+
+                        <literal>"off" </literal> (tipsは格子点にのみ配置可能)とします.
+
+                    </para>
+
+                </listitem>
+
+            </varlistentry>
+
+            <varlistentry>
+
                 <term>box_mode: </term>
 
                 <listitem>
 
             <varlistentry>
 
-                <term>orientation: </term>
+                <term>display_components: </term>
+
+                <listitem>
+                    <para>
+                        This field controls which components are displayed. Its default value is
+                        <literal>"xy"</literal>for 2D views and <literal>"xyz"</literal> for 3D views.
+                        Possible values are any combination of <literal>"x"</literal>,
+                        <literal>"y"</literal> and <literal>"z"</literal>, like
+                        <literal>"zy"</literal>, <literal>"xzy"</literal>, <literal>"xz"</literal>,
+                        <literal>"y"</literal>, etc.
+                    </para>
+                    <para>
+                      The components are drawn in the order they are found in the string.
+                    </para>
+                </listitem>
+
+            </varlistentry>
+
+            <varlistentry>
+
+                <term>display_function: </term>
 
                 <listitem>
 
                     <para>
 
-                        このフィールドは,ポリラインの点に関するテキストボックスの位置を指定します.
+                        <literal>
 
-                        指定可能な値は 0, 1, 2 または 3 です.
+                            <link linkend="polyline_properties">polyline_properties</link>
+
+                        </literal>
+
+                        のヘルプページを参照.
 
                     </para>
 
 
             </varlistentry>
 
-            <varlistentry>
+           <varlistentry>
 
-                <term>display_components: </term>
+                <term>orientation: </term>
 
                 <listitem>
 
                     <para>
 
-                        このフィールドに指定できる値
+                        このフィールドは,ポリラインの点に関するテキストボックスの位置を指定します.
 
-                        <literal>"xyz"</literal>.
+                        指定可能な値は 0, 1, 2 または 3 です.
 
                     </para>
 
             </varlistentry>
 
             <varlistentry>
-
-                <term>interp_mode: </term>
-
+                <term>detached_position: </term>
                 <listitem>
-
                     <para>
-
-                        このフィールドはtipの位置の補間モードを指定します.
-
-                        この値は <literal>"on" </literal> (格子点間で補間を行う)または
-
-                        <literal>"off" </literal> (tipsは格子点にのみ配置可能)とします.
-
+                      This field sets the position <literal>[x y z]</literal> of the bottom left
+                      corner of the datatip text box, even when the link to the polyline starts
+                      from another corner.  When its value  is <literal>[]</literal>,
+                      the datatip text box is drawn attached to its anchor point in the polyline.
                     </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>display_function: </term>
-
-                <listitem>
-
                     <para>
-
-                        <literal>
-
-                            <link linkend="polyline_properties">polyline_properties</link>
-
-                        </literal>
-
-                        のヘルプページを参照.
-
+                      In detached mode, it is not possible to force the starting point of the link
+                      on the box frame. It is autoset.
                     </para>
-
                 </listitem>
-
             </varlistentry>
 
             <varlistentry>
         </simplelist>
 
     </refsection>
-
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.2</revnumber>
+                <revremark>
+                    <para>
+                        New "orientation" values available: "left", "right", "upper", "lower".
+                    </para>
+                </revremark>
+            </revision>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>
+                   <itemizedlist>
+                     <listitem>
+                       <para><literal>.z_component</literal> is removed.</para>
+                     </listitem>
+                     <listitem>
+                       <para>New <literal>.display_components</literal> property.</para>
+                     </listitem>
+                       <para>New <literal>.detached_position</literal> property.</para>
+                     <listitem>
+                     </listitem>
+                   </itemizedlist>
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
 
index 7a8b0c8..113cd0e 100644 (file)
 
  -->
 
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="ja" xml:id="polyline_properties">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ja" xml:id="polyline_properties">
 
     <refnamediv>
 
             </varlistentry>
 
             <varlistentry>
+                <term>datatip_display_mode: </term>
+                <listitem>
+                    <para>
+                        The value can be one of the following:
+                        <itemizedlist>
+                          <listitem>
+                            <literal>"always"</literal>: the datatip is always displayed (default mode).
+                          </listitem>
+                          <listitem>
+                            <literal>"mouseclick"</literal>: clicking on the anchor of the datatip
+                             on the line toogles its display. The anchor is always displayed.
+                          </listitem>
+                          <listitem>
+                            <literal>"mouseover"</literal>: setting the mouse pointer over the
+                            datatip anchor on the line displays the datatip. When going away, the
+                            datatip is masked. Its anchor remains displayed.
+                          </listitem>
+                        </itemizedlist>
+                    </para>
+                </listitem>
+            </varlistentry>
+          <varlistentry>
 
                 <term>display_function: </term>
 
@@ -1130,10 +1155,15 @@ f.children.y_label.font_size = 3;
                 </revremark>
 
             </revision>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>
+                  <para>New property <literal>.datatip_display_mode</literal> introduced.</para>
+                </revremark>
+            </revision>
 
         </revhistory>
 
     </refsection>
 
 </refentry>
-
index 9cfa137..e4ddc97 100644 (file)
 
  -->
 
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="ja" xml:id="xstring">
+<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="xstring">
 
     <refnamediv>
 
 
         <title>呼び出し手順</title>
 
-        <synopsis>xstring(x,y,str,[angle,[box]])</synopsis>
+        <synopsis>
+          xstring(x, y, str)
+          xstring(x, y, str, angle)
+          xstring(x, y, str, angle, box)
+        </synopsis>
 
     </refsynopsisdiv>
 
         <title>例</title>
 
         <programlisting role="example"><![CDATA[
-
 plot2d([0;1],[0;1],0)
-
 xstring(0.5,0.5,["$\overbrace{Scilab}$" "n''est ";"pas" "$\underbrace{Matlab}$"])
-
 // LaTeX レンダリング (>= Scilab 5.2)
 
-
-
 //Other example
-
 alphabet=["a" "b" "c" "d" "e" "f" "g" ..
-
           "h" "i" "j" "k" "l" "m" "n" ..
-
           "o" "p" "q" "r" "s" "t" "u" ..
-
           "v" "w" "x" "y" "z"];
-
 clf()
-
 plot2d([0;1],[0;2],0)
-
 xstring(0.1,1.8,alphabet)     // アルファベット
-
 xstring(0.1,1.6,alphabet,0,1) // ボックス内にアルファベット
-
 xstring(0.1,1.4,alphabet,20)  // 角度
-
 set(gca(),"font_style",1,"font_size",1);              // symbolフォントを使用
-
 xstring(0.1,0.1,alphabet)
-
 xstring(0.1,0.3,alphabet)
-
 gce().font_size = 3;         // フォントの大きさを変更
-
 xstring(0.1,0.6,"a") //大きなアルファ
-
 gce().font_size = 24;
-
  ]]></programlisting>
 
         <scilab:image>
@@ -243,44 +229,24 @@ gce().font_size = 24;
     </refsection>
 
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
-                <link linkend="titlepage">titlepage</link>
-
+                <link linkend="text_properties">text_properties</link>
             </member>
-
             <member>
-
-                <link linkend="xnumb">xnumb</link>
-
+                <link linkend="math_rendering_features_in_graphic">Math mode in strings</link>
             </member>
-
-            <member>
-
-                <link linkend="xstringb">xstringb</link>
-
+          <member>
+                <link linkend="xnumb">xnumb</link>
             </member>
-
             <member>
-
-                <link linkend="xstringl">xstringl</link>
-
+                <link linkend="xtitle">xtitle</link>
             </member>
-
             <member>
-
-                <link linkend="xtitle">xtitle</link>
-
+                <link linkend="titlepage">titlepage</link>
             </member>
-
         </simplelist>
-
     </refsection>
-
 </refentry>
 
index 08cb5e8..4684d23 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="pt" xml:id="datatip_properties">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="pt" xml:id="datatip_properties">
     <refnamediv>
         <refname>propriedades das datatips</refname>
         <refpurpose>Descição das propriedades para a entidade Datatip.
                 </listitem>
             </varlistentry>
             <varlistentry>
+                <term>interp_mode: </term>
+                <listitem>
+                    <para>
+                        Esse campo controla a interpolação utilizada para posicionar a datatip. Quando este valor é
+                        <literal>"on"</literal> é aplicada uma interpolação linear entre a malha de pontos no posicionamento
+                        das datatips, quando seu valor é <literal>"off"</literal> as datatips so podem ser posicionadas sobre
+                        os pontos contidos na malha.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>box_mode: </term>
                 <listitem>
                     <para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>orientation: </term>
+                <term>display_components: </term>
                 <listitem>
                     <para>
-                        Este campo controla a posição da caixa de texto em respeito ao ponto de âncora na polyline.
-                        Os possíveis valores são 0 (esquerdo superior), 1 (direito superior), 2 (esquerdo inferior), 3 (direito inferior),
-                        4 (esquerda), 5 (direita), 6 (superior) ou 7 (inferior).
+                        Esse campo controla quais componentes são desenhadas. Quando em 2D, seu valor padrão é
+                        <literal>"xy"</literal>, para 3D seu valor padrão é <literal>"xyz"</literal>.
+                        Possíveis valores para este campo incluem qualquer combinação de <literal>"x"</literal>,
+                        <literal>"y"</literal> e <literal>"z"</literal>.
+                        Alguns exemplos para este campo são <literal>"zy"</literal>,
+                        <literal>"xzy"</literal>, <literal>"xz"</literal>, <literal>"y"</literal>
+                        e assim por diante.
                     </para>
+                   <para>
+                     As componentes sao desenhadas na mesma ordem em que são encontradas na string.
+                   </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>display_components: </term>
+                <term>display_function: </term>
+                <listitem>
+                    <para>Veja
+                        <literal>
+                            <link linkend="polyline_properties">polyline_properties</link>
+                        </literal>
+                        nas páginas de ajuda.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>orientation: </term>
                 <listitem>
                     <para>
-                        Esse campo controla quais componentes são desenhadas. Quando em 2D, seu valor padrão é
-                        <literal>"xy"</literal>, para 3D seu valor padrão é <literal>"xyz"</literal>.
-                        Possíveis valores para este campo incluem qualquer combinação de <literal>"x"</literal>,
-                        <literal>"y"</literal> e <literal>"z"</literal>.
-                        Alguns exemplos para este campo são <literal>"zy"</literal>, <literal>"xzy"</literal>, <literal>"xz"</literal>, <literal>"y"</literal> e assim por diante.
-                        Nota: As componentes sao desenhadas na mesma ordem em que são encontradas na string.
+                        Este campo controla a posição da caixa de texto em respeito ao ponto de âncora na polyline.
+                        Os possíveis valores são 0 (esquerdo superior), 1 (direito superior), 2 (esquerdo inferior), 3 (direito inferior),
+                        4 (esquerda), 5 (direita), 6 (superior) ou 7 (inferior).
                     </para>
                 </listitem>
             </varlistentry>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>interp_mode: </term>
+                <term>detached_position: </term>
                 <listitem>
                     <para>
-                        Esse campo controla a interpolação utilizada para posicionar a datatip. Quando este valor é
-                        <literal>"on"</literal> é aplicada uma interpolação linear entre a malha de pontos no posicionamento
-                        das datatips, quando seu valor é <literal>"off"</literal> as datatips so podem ser posicionadas sobre
-                        os pontos contidos na malha.
+                      This field sets the position <literal>[x y z]</literal> of the bottom left
+                      corner of the datatip text box, even when the link to the polyline starts
+                      from another corner.  When its value  is <literal>[]</literal>,
+                      the datatip text box is drawn attached to its anchor point in the polyline.
                     </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>display_function: </term>
-                <listitem>
-                    <para>Veja
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        nas páginas de ajuda.
+                    <para>
+                      In detached mode, it is not possible to force the starting point of the link
+                      on the box frame. It is autoset.
                     </para>
                 </listitem>
             </varlistentry>
                     </para>
                 </revremark>
             </revision>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>
+                   <itemizedlist>
+                     <listitem>
+                       <para><literal>.z_component</literal> is removed.</para>
+                     </listitem>
+                     <listitem>
+                       <para>New <literal>.display_components</literal> property.</para>
+                     </listitem>
+                       <para>New <literal>.detached_position</literal> property.</para>
+                     <listitem>
+                     </listitem>
+                   </itemizedlist>
+                </revremark>
+            </revision>
         </revhistory>
     </refsection>
 </refentry>
index 5af6ded..e2ff6da 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="xstring" 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="xstring" xml:lang="pt">
     <refnamediv>
         <refname>xstring</refname>
         <refpurpose>imprime strings</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>xstring(x,y,str,[angle,[box]])</synopsis>
+        <synopsis>
+          xstring(x, y, str)
+          xstring(x, y, str, angle)
+          xstring(x, y, str, angle, box)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
@@ -93,19 +100,19 @@ gce().font_size = 24;
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="titlepage">titlepage</link>
+                <link linkend="text_properties">text_properties</link>
             </member>
             <member>
-                <link linkend="xnumb">xnumb</link>
+                <link linkend="math_rendering_features_in_graphic">Math mode in strings</link>
             </member>
-            <member>
-                <link linkend="xstringb">xstringb</link>
+          <member>
+                <link linkend="xnumb">xnumb</link>
             </member>
             <member>
-                <link linkend="xstringl">xstringl</link>
+                <link linkend="xtitle">xtitle</link>
             </member>
             <member>
-                <link linkend="xtitle">xtitle</link>
+                <link linkend="titlepage">titlepage</link>
             </member>
         </simplelist>
     </refsection>
index d8d7cb6..7102bf3 100644 (file)
@@ -1,13 +1,18 @@
 <?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="uigetdir">
+<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="uigetdir">
     <refnamediv>
         <refname>uigetdir</refname>
         <refpurpose>dialog for selecting a directory</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>directory = uigetdir()
-            directory = uigetdir(start_path [,title])
+        <synopsis>
+            directory = uigetdir()
+            directory = uigetdir(start_path)
+            directory = uigetdir(start_path, title)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index b72d834..64da3cf 100644 (file)
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="uigetfile" 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="uigetfile" xml:lang="en">
     <refnamediv>
         <refname>uigetfile</refname>
-        <refpurpose>dialog window to get a file(s) name(s), path and filter
-            index
+        <refpurpose>dialog window to get a file(s) name(s), path and filter index
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[FileName[,PathName[,FilterIndex]]]=uigetfile([file_mask[,dir[,boxTitle[,multipleSelection]]]])
-            PathFileName=uigetfile([file_mask[,dir[,boxTitle[,multiple]]]])
+        <synopsis>
+          PathFileName = uigetfile()
+          PathFileName = uigetfile(file_mask)
+          PathFileName = uigetfile(file_mask, dir)
+          PathFileName = uigetfile(file_mask, dir, boxTitle)
+          PathFileName = uigetfile(file_mask, dir, boxTitle, multipleSelection)
+          [PathFileName, Path] = uigetfile(..)
+          [PathFileName, Path, FilterIndex] = uigetfile(..)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
+        <title>Arguments</title>
+        <refsect3>
         <title>Input parameters</title>
         <variablelist>
             <varlistentry>
                 <listitem>
                     <para>a string matrix which gives the file masks to use for file
                         selection. <literal>file_mask</literal> is written with Unix
-                        convention. The default value is '*'.
+                        conventions. The default value is <literal>"*"</literal>.
                     </para>
-                    <para>we can also add descriptions for masks, for example ["*.x*","X
-                        files";"*.bin","BIN files"].
+                    <para>A description of each mask may be provided in column#2, for example
+                      <literal>["*.xcos|*.zcos", "Xcos files"; "*.bin","BIN files"]</literal>.
                     </para>
                 </listitem>
             </varlistentry>
                 </listitem>
             </varlistentry>
         </variablelist>
-    </refsection>
-    <refsection>
+      </refsect3>
+      <refsect3>
         <title>Output parameters</title>
         <variablelist>
             <varlistentry>
-                <term>FileName</term>
+                <term>PathFileName</term>
                 <listitem>
-                    <para>matrix of string which give the user selected file(s) (path +
-                        file(s) name(s)) if user answers "Ok" or the " " string if user
-                        answers "Cancel".
+                    <para>matrix of strings which give the user selected file(s) (path +
+                      file(s) name(s)) if user answers <literal>"OK"</literal> or
+                      <literal>" "</literal> if the user answers <literal>"Cancel"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>PathName</term>
+                <term>Path</term>
                 <listitem>
-                    <para>is the user selected file(s) path if user answers "Ok" or the
-                        " " string if user answers "Cancel".
+                    <para>is the user selected file(s) path if the user answers <literal>"Ok"</literal>
+                      or <literal>" "</literal> if the user answers <literal>"Cancel"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>FilterIndex</term>
                 <listitem>
-                    <para>is the user selected filter index on the list box if user
-                        answers "Ok" or '0' string if user answers "Cancel"
+                    <para>
+                      Selected filter index on the list box if the user answers
+                      <literal>"OK"</literal>, or <literal>"0"</literal> if the user answers
+                      <literal>"Cancel"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
+      </refsect3>
     </refsection>
     <refsection>
         <title>Description</title>
     <refsection>
         <title>Examples</title>
         <programlisting role="example">
-            uigetfile(["*.bin";"*.sce";"*.cos*"])
-            uigetfile(["*.sci";"*.bin"],"SCI/modules/gui/macros/")
-            uigetfile(["*.sc*";"*.bin"],"SCI/modules/gui/macros/")
-            uigetfile(["*.x*","X files";"*.bin","BIN files"],"SCI/modules/gui/macros/")
-            uigetfile(["*.sce";"*.bin"],"SCI/modules/gui/macros/", "Choose a file name", %t);
-            uigetfile(["*.sce";"*.bin"],"SCI/modules/gui/macros/", "Choose a file name", %f);
+            uigetfile(["*.bin"; "*.sce"; "*.cos*"])
+            uigetfile(["*.tst|*.dia.ref","Tests files"])
+            uigetfile(["*.sci"; "*.bin"], "SCI/modules/gui/macros/")
+            uigetfile(["*.sc*"; "*.bin"], "SCI/modules/gui/macros/")
+            uigetfile(["*.xcos|*.zcos","Xcos files"; "*.bin","BIN files"], "SCI/modules/gui/macros/")
+            uigetfile(["*.sce"; "*.bin"], "SCI/modules/gui/macros/", "Choose a file name", %t);
+            uigetfile(["*.sce"; "*.bin"], "SCI/modules/gui/macros/", "Choose a file name", %f);
         </programlisting>
     </refsection>
     <refsection role="see also">
index 33b6df9..adf6023 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="uigetfont">
+<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="uigetfont">
     <refnamediv>
         <refname>uigetfont</refname>
         <refpurpose>Opens a dialog for selecting a font.</refpurpose>
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            uigetfont()
-
-            [fontname [,fontsize [,bold [,italic]]]] = uigetfont([defaultfontname [,defaultfontsize [,defaultbold [,defaultitalic]]]]);
-
-            [fontname ,fontsize ,bold ,italic] = uigetfont(defaultfontname ,defaultfontsize ,defaultbold ,defaultitalic);
+            [fontname, fontsize, bold, italic] = uigetfont()
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname)
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname, defaultfontsize)
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname, defaultfontsize , defaultbold)
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname, defaultfontsize , defaultbold, defaultitalic);
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
+        <para>All output arguments are optional, provided that their order is kept.</para>
         <variablelist>
             <varlistentry>
                 <term>defaultfontname</term>
@@ -81,4 +85,12 @@ uigetfont("arial", 24, %T)
 uigetfont("arial", 24, %T, %F)
  ]]></programlisting>
     </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="xlfont">xlfont</link>
+            </member>
+        </simplelist>
+    </refsection>
 </refentry>
index ea21675..b7077aa 100644 (file)
@@ -1,52 +1,77 @@
 <?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="uiputfile">
+<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="uiputfile">
     <refnamediv>
         <refname>uiputfile</refname>
         <refpurpose>Open standard dialog box for selecting and saving file.</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[FileName[,PathName[,FilterIndex]]]=uiputfile([file_mask[,dir[,boxTitle]]])
-            PathFileName=uiputfile([file_mask[,dir[,boxTitle]]])
+        <synopsis>
+          PathFileName = uiputfile()
+          PathFileName = uiputfile(file_mask)
+          PathFileName = uiputfile(file_mask, dir)
+          PathFileName = uiputfile(file_mask, dir, boxTitle)
+          [PathFileName, Path] = uiputfile(..)
+          [PathFileName, Path, FilterIndex] = uiputfile(..)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Input parameters</title>
+        <title>Arguments</title>
+        <refsect3>
+          <title>Input parameters</title>
+          <variablelist>
+              <varlistentry>
+                  <term>file_mask</term>
+                  <listitem>
+                      <para>
+                          Matrix of strings providing the file masks to use for file selection.
+                          <literal>file_mask</literal> is written with Unix conventions.
+                          The default value is '*'.
+                      </para>
+                      <para>
+                        A description of each mask may be provided in column#2 and displayed,
+                        for example ["*.xcos|*.zcos*","Xcos files"; "*.scg", "Scilab graphics"].
+                      </para>
+                  </listitem>
+              </varlistentry>
+              <varlistentry>
+                  <term>dir</term>
+                  <listitem>
+                      <para>
+                        a character string which gives the initial directory used for file search.
+                        By default uiputfile uses the previously selected directory.
+                      </para>
+                  </listitem>
+              </varlistentry>
+              <varlistentry>
+                  <term>boxTitle</term>
+                  <listitem>
+                      <para>
+                        a character string which gives the title of the uiputfile window.
+                        By default uiputfile's title is 'uiputfile'.
+                      </para>
+                  </listitem>
+              </varlistentry>
+          </variablelist>
+      </refsect3>
+      <refsect3>
+        <title>Output parameters</title>
         <variablelist>
             <varlistentry>
-                <term>file_mask</term>
+                <term>PathFileName</term>
                 <listitem>
                     <para>
-                        a string matrix which gives the file masks to use for file selection. <literal>file_mask</literal> is written with Unix convention. The default value is '*'.
+                      String which gives the user selected file (path + file name) if the user
+                      quits with <literal>"OK"</literal>, or <literal>" "</literal> if the user quits
+                      with <literal>"Cancel"</literal>.
                     </para>
-                    <para>we can also add descriptions for masks, for example ["*.x*","X files";"*.bin","BIN files"].</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>dir</term>
-                <listitem>
-                    <para>a character string which gives the initial directory used for file search. By default uiputfile uses the previously selected directory.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>boxTitle</term>
-                <listitem>
-                    <para>a character string which gives the title of the uiputfile window. By default uiputfile's title is 'uiputfile'.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Output parameters</title>
-        <variablelist>
-            <varlistentry>
-                <term>FileName</term>
-                <listitem>
-                    <para>string which give the user selected file (path + file name) if user answers "Ok" or the " " string if user answers "Cancel".</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>PathName</term>
+                <term>Path</term>
                 <listitem>
                     <para>is the user selected file path if user answers "Ok" or the " " string if user answers "Cancel".</para>
                 </listitem>
             <varlistentry>
                 <term>FilterIndex</term>
                 <listitem>
-                    <para>is the user selected filter index on the list box if user answers "Ok" or '0' string if user answers "Cancel"</para>
+                    <para>is the user selected filter index on the list box if the user quits with
+                      <literal>"OK"</literal>, or <literal>"0"</literal> if the user quits with
+                      <literal>"Cancel"</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
+      </refsect3>
     </refsection>
     <refsection>
         <title>Description</title>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-uiputfile(["*.bin";"*.sce";"*.cos*"])
-uiputfile(["*.sci";"*.bin"],"SCI/modules/gui/macros/")
-uiputfile(["*.sc*";"*.bin"],"SCI/modules/gui/macros/")
-uiputfile(["*.x*","X files";"*.bin","BIN files"],"SCI/modules/gui/macros/")
-uiputfile(["*.sce";"*.bin"],"SCI/modules/gui/macros/", "Choose a file name");
+uiputfile(["*.bin"; "*.sce"; "*.cos*"])
+uiputfile(["*.xcos|*.zcos", "Xcos files"; "*.sce|*.sci", "Scilab scripts"])
+uiputfile(["*.sci"; "*.bin"], "SCI/modules/gui/macros/")
+uiputfile(["*.sc*"; "*.bin"], "SCI/modules/gui/macros/")
+uiputfile(["*.x*","X files"; "*.bin","BIN files"], "SCI/modules/gui/macros/")
+uiputfile(["*.sce"; "*.bin"], "SCI/modules/gui/macros/", "Choose a file name");
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 1993652..a9b6412 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>directory = uigetdir()
-            directory = uigetdir(start_path [,title])
+        <synopsis>
+            directory = uigetdir()
+            directory = uigetdir(start_path)
+            directory = uigetdir(start_path, title)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 69e9cab..cdce43e 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: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="uigetfile" 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="uigetfile" xml:lang="ja">
     <refnamediv>
         <refname>uigetfile</refname>
         <refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>[FileName[,PathName[,FilterIndex]]]=uigetfile([file_mask[,dir[,boxTitle[,multipleSelection]]]])
-            PathFileName=uigetfile([file_mask[,dir[,boxTitle[,multiple]]]])
+        <synopsis>
+          PathFileName = uigetfile()
+          PathFileName = uigetfile(file_mask)
+          PathFileName = uigetfile(file_mask, dir)
+          PathFileName = uigetfile(file_mask, dir, boxTitle)
+          PathFileName = uigetfile(file_mask, dir, boxTitle, multipleSelection)
+          [PathFileName, Path] = uigetfile(..)
+          [PathFileName, Path, FilterIndex] = uigetfile(..)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
+        <title>設定</title>
+        <refsect3>
         <title>入力パラメータ</title>
         <variablelist>
             <varlistentry>
                         ファイル選択時に使用されるファイルマスクを指定する
                         文字列行列.
                         <literal>file_mask</literal> はUnix表記で指定します.
-                        デフォルト値は '*'です.
+                        デフォルト値は <literal>"*"</literal>です.
                     </para>
                     <para>
-                        ["*.x*","X
-                        files";"*.bin","BIN files"]のように,
+                      <literal>["*.xcos|*.zcos","Xcos files"; "*.bin","BIN files"]</literal>のように,
                         マスクに説明を追加することができます.
                     </para>
                 </listitem>
@@ -55,8 +65,8 @@
                 <term>multipleSelection</term>
                 <listitem>
                     <para>
-                        論理値で,'%f'(false)を指定した場合に一つのファイルのみ,
-                        '%t' (true)を指定した場合に複数のファイルを
+                      論理値で,<literal>%f</literal>(false)を指定した場合に一つのファイルのみ,
+                      <literal>%t</literal> (true)を指定した場合に複数のファイルを
                         読み込むことができます.
                         デフォルトで, uigetfileの複数ファイル選択は
                         有効ではありません.
                 </listitem>
             </varlistentry>
         </variablelist>
-    </refsection>
-    <refsection>
+      </refsect3>
+      <refsect3>
         <title>出力パラメータ</title>
         <variablelist>
             <varlistentry>
-                <term>FileName</term>
+                <term>PathFileName</term>
                 <listitem>
                     <para>
-                        ユーザが "Ok" と答えた場合は,
+                      ユーザが <literal>"OK"</literal> と答えた場合は,
                         ユーザが選択したファイルを指定する文字列の行列
                         (パス + ファイル名),
-                        ユーザが "Cancel"した場合は " "文字列を.
+                      ユーザが <literal>"Cancel"</literal>した場合は " "文字列を.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>PathName</term>
+                <term>Path</term>
                 <listitem>
                     <para>
-                        ユーザーが "Ok" と答えた場合はユーザが選択したファイル,
-                        ユーザが"Cancel"と答えた場合は" "文字列.
+                      ユーザーが <literal>"OK"</literal> と答えた場合はユーザが選択したファイル,
+                      ユーザが<literal>"Cancel"</literal>と答えた場合は" "文字列.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>FilterIndex</term>
                 <listitem>
                     <para>
-                        ユーザーが "Ok" と答えた場合はリストボックスで
+                        ユーザーが <literal>"OK"</literal> と答えた場合はリストボックスで
                         ユーザが選択したファイル添字,
-                        ユーザが"Cancel"と答えた場合は" "文字列.
+                        ユーザが<literal>"Cancel"</literal>と答えた場合は" "文字列.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
+      </refsect3>
     </refsection>
     <refsection>
         <title>説明</title>
     <refsection>
         <title>例</title>
         <programlisting role="example">
-            uigetfile(["*.bin";"*.sce";"*.cos*"])
-            uigetfile(["*.sci";"*.bin"],"SCI/modules/gui/macros/")
-            uigetfile(["*.sc*";"*.bin"],"SCI/modules/gui/macros/")
-            uigetfile(["*.x*","X files";"*.bin","BIN files"],"SCI/modules/gui/macros/")
-            uigetfile(["*.sce";"*.bin"],"SCI/modules/gui/macros/", "Choose a file name", %t);
-            uigetfile(["*.sce";"*.bin"],"SCI/modules/gui/macros/", "Choose a file name", %f);
+            uigetfile(["*.bin"; "*.sce"; "*.cos*"])
+            uigetfile(["*.tst|*.dia.ref","Tests files"])
+            uigetfile(["*.sci"; "*.bin"], "SCI/modules/gui/macros/")
+            uigetfile(["*.sc*"; "*.bin"], "SCI/modules/gui/macros/")
+            uigetfile(["*.xcos|*.zcos","Xcos files"; "*.bin","BIN files"], "SCI/modules/gui/macros/")
+            uigetfile(["*.sce"; "*.bin"], "SCI/modules/gui/macros/", "Choose a file name", %t);
+            uigetfile(["*.sce"; "*.bin"], "SCI/modules/gui/macros/", "Choose a file name", %f);
         </programlisting>
     </refsection>
     <refsection role="see also">
index 386c673..96615f4 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="uigetfont">
+<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="uigetfont">
     <refnamediv>
         <refname>uigetfont</refname>
         <refpurpose>フォント選択用のダイアログを開く.</refpurpose>
@@ -7,9 +10,13 @@
     <refsynopsisdiv>
         <title>呼び出し手順</title>
         <synopsis>
-            uigetfont()
-            [fontname [,fontsize [,bold [,italic]]]] = uigetfont([defaultfontname [,defaultfontsize [,defaultbold [,defaultitalic]]]]);
-            [fontname ,fontsize ,bold ,italic] = uigetfont(defaultfontname ,defaultfontsize ,defaultbold ,defaultitalic);
+        <synopsis>
+            [fontname, fontsize, bold, italic] = uigetfont()
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname)
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname, defaultfontsize)
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname, defaultfontsize , defaultbold)
+            [fontname, fontsize, bold, italic] = uigetfont(defaultfontname, defaultfontsize , defaultbold, defaultitalic);
+        </synopsis>
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -102,4 +109,12 @@ uigetfont("arial", 24, %T)
 uigetfont("arial", 24, %T, %F)
  ]]></programlisting>
     </refsection>
+    <refsection role="see also">
+        <title>参照</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="xlfont">xlfont</link>
+            </member>
+        </simplelist>
+    </refsection>
 </refentry>
index 5f15226..224c37f 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="uiputfile">
+<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="uiputfile">
     <refnamediv>
         <refname>uiputfile</refname>
         <refpurpose>ファイル選択/保存用の標準ダイアログボックスを開く.
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>[FileName[,PathName[,FilterIndex]]]=uiputfile([file_mask[,dir[,boxTitle]]])
-            PathFileName=uiputfile([file_mask[,dir[,boxTitle]]])
+        <synopsis>
+          PathFileName = uiputfile()
+          PathFileName = uiputfile(file_mask)
+          PathFileName = uiputfile(file_mask, dir)
+          PathFileName = uiputfile(file_mask, dir, boxTitle)
+          [PathFileName, Path] = uiputfile(..)
+          [PathFileName, Path, FilterIndex] = uiputfile(..)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
+        <title>設定</title>
+        <refsect3>
         <title>入力パラメータ</title>
         <variablelist>
             <varlistentry>
@@ -26,7 +36,7 @@
                     </para>
                     <para>
                         マスク用の説明を追加することができます.
-                        例えば,["*.x*","X files";"*.bin","BIN files"].
+                        例えば,["*.xcos|*.zcos*","Xcos files"; "*.scg", "Scilab graphics"].
                     </para>
                 </listitem>
             </varlistentry>
                 </listitem>
             </varlistentry>
         </variablelist>
-    </refsection>
-    <refsection>
+        </refsect3>
+        <refsect3>
         <title>出力パラメータ</title>
         <variablelist>
             <varlistentry>
-                <term>FileName</term>
+                <term>PathFileName</term>
                 <listitem>
                     <para>
-                        ユーザが"Ok"を押した場合は,
+                        ユーザが<literal>"OK"</literal>を押した場合は,
                         ユーザが選択したファイルを指定する文字列
                         (パス + ファイル名) ,または
-                        ユーザが"Cancel"を押した場合は" "文字列.
+                        ユーザが<literal>"Cancel"</literal>を押した場合は" "文字列.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>PathName</term>
+                <term>Path</term>
                 <listitem>
                     <para>
-                        ユーザが"Ok"を押した場合は,
+                        ユーザが<literal>"OK"</literal>を押した場合は,
                         ユーザが選択したファイルパス ,または
-                        ユーザが"Cancel"を押した場合は" "文字列.
+                        ユーザが<literal>"Cancel"</literal>を押した場合は" "文字列.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>FilterIndex</term>
                 <listitem>
                     <para>
-                        ユーザが"Ok"を押した場合は,
+                        ユーザが<literal>"OK"</literal>を押した場合は,
                         リストボックスでユーザが選択したフィルタ添字,
-                        ユーザが"Cancel"を押した場合は" "文字列.
+                       ユーザが<literal>"Cancel"</literal>を押した場合は" "文字列.
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
+       </refsect3>
     </refsection>
     <refsection>
         <title>説明</title>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-uiputfile(["*.bin";"*.sce";"*.cos*"])
-uiputfile(["*.sci";"*.bin"],"SCI/modules/gui/macros/")
-uiputfile(["*.sc*";"*.bin"],"SCI/modules/gui/macros/")
-uiputfile(["*.x*","X files";"*.bin","BIN files"],"SCI/modules/gui/macros/")
-uiputfile(["*.sce";"*.bin"],"SCI/modules/gui/macros/", "Choose a file name");
+uiputfile(["*.bin"; "*.sce"; "*.cos*"])
+uiputfile(["*.xcos|*.zcos", "Xcos files"; "*.sce|*.sci", "Scilab scripts"])
+uiputfile(["*.sci"; "*.bin"], "SCI/modules/gui/macros/")
+uiputfile(["*.sc*"; "*.bin"], "SCI/modules/gui/macros/")
+uiputfile(["*.x*","X files"; "*.bin","BIN files"], "SCI/modules/gui/macros/")
+uiputfile(["*.sce"; "*.bin"], "SCI/modules/gui/macros/", "Choose a file name");
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index ebe691c..813894e 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="grand">
+<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="grand">
     <refnamediv>
         <refname>grand</refname>
         <refpurpose>Random numbers</refpurpose>
             Y = grand(m, n, o,..,"..",...)
             Y = grand(X, ...)
         </synopsis>
-
+        <para/>
         <synopsis>
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
         </synopsis>
-
+        <para/>
         <synopsis>
             S = grand("getgen")
             grand("setgen", gen)
                         <code>Y = grand(m, n, "bet", A, B)</code> generates
                         random variates from the beta distribution with parameters
                         <varname>A</varname> and <varname>B</varname>.  The density
-                        of the beta distribution is <latex><![CDATA[(0 < x < 1)]]></latex>:
+                        of the beta distribution is (0 &lt; x &lt; 1):
                     </para>
                     <para>
                         <latex>
                     </para>
                     <para>
                         <varname>A</varname> and <varname>B</varname> must be
-                        reals <latex><![CDATA[>10^{-37}]]></latex>.  Related function: <link linkend="cdfbet">cdfbet</link>.
+                        reals >10<superscript>-37</superscript>.
+                        Related function: <link linkend="cdfbet">cdfbet</link>.
                     </para>
                 </listitem>
             </varlistentry>
                         random variates from the geometric distribution with
                         parameter <varname>p</varname> : number of Bernouilli trials
                         (with probability success of <varname>p</varname>) until a
-                        success is met. <varname>p</varname> must be in
-                        <latex>[p_{min},1]</latex> (with <latex> p_{min} = 1{,}3\times 10^{-307} </latex>).
+                        success is met. <varname>p</varname> must be in [1.3e-307, 1].
                     </para>
                     <para>
                         <varname>Y</varname> contains positive real numbers
                         <code>Y = grand(n, "markov", P, x0)</code> generate
                         <varname>n</varname> successive states of a Markov chain
                         described by the transition matrix
-                        <varname>P</varname>. A sum of each the rows in <varname>P</varname> is <literal>1</literal>. Initial state is given by <varname>x0</varname>. If <varname>x0</varname> is a
-                        matrix of size <code>m=size(x0,"*")</code> then
-                        <varname>Y</varname> is a matrix of size <varname>m</varname>-by-<varname>n</varname>.  <code>Y(i,:)</code> code the sample path
-                        obtained from initial state <code>x0(i)</code>.
+                        <varname>P</varname>. A sum of each the rows in <varname>P</varname> is
+                        <literal>1</literal>. Initial state is given by <varname>x0</varname>.
+                        If <varname>x0</varname> is a  matrix of size <code>m=size(x0,"*")</code> then
+                        <varname>Y</varname> is a matrix of size <varname>m</varname>-by-<varname>n</varname>.
+                        <code>Y(i,:)</code> code the sample path  obtained from initial state
+                        <code>x0(i)</code>.
                     </para>
                 </listitem>
             </varlistentry>
                         "balls" in <literal>m</literal>
                         "boxes"). <literal>P(i)</literal> is the probability that
                         an event will be classified into category
-                        <literal>i</literal>. The column vector of probabilities <varname>P</varname> is of
-                        size <literal>m-1</literal> (the probability of category
+                        <literal>i</literal>. The column vector of probabilities <varname>P</varname>
+                        is of size <literal>m-1</literal> (the probability of category
                         <literal>m</literal> is <literal>1-sum(P)</literal>).
                         <varname>Y</varname> is of size <literal>m</literal>-by-<varname>n</varname>.
                         Each column <literal>Y(:,j)</literal> is an observation
                     <para>
                         <code>Y = grand(m, n, "poi", mu)</code> generates
                         random variates from the Poisson distribution with mean
-                        <varname>mu</varname> (<literal>real</literal> &gt;= <literal>0.0</literal>). Related function:
-                        <link linkend="cdfpoi">cdfpoi</link>.
+                        <varname>mu</varname> (<literal>real</literal> &gt;= <literal>0.0</literal>).
+                        Related function:  <link linkend="cdfpoi">cdfpoi</link>.
                     </para>
                 </listitem>
             </varlistentry>
                     <para>
                         <code>S = grand("getgen")</code> returns the current base generator.
                         In this case <varname>S</varname> is
-                        a string among <literal>"mt"</literal>, <literal>"kiss"</literal>, <literal>"clcg2"</literal>, <literal>"clcg4"</literal>, <literal>"urand"</literal>.
+                        a string among <literal>"mt"</literal>, <literal>"kiss"</literal>,
+                        <literal>"clcg2"</literal>, <literal>"clcg4"</literal>, <literal>"urand"</literal>.
                     </para>
                 </listitem>
             </varlistentry>
                 <listitem>
                     <para>
                         <code>grand("setgen",gen)</code> sets the current base generator to be <varname>gen</varname>
-                        a string among <literal>"mt"</literal>, <literal>"kiss"</literal>, <literal>"clcg2"</literal>, <literal>"clcg4"</literal>, <literal>"urand"</literal>.
+                        a string among <literal>"mt"</literal>, <literal>"kiss"</literal>,
+                        <literal>"clcg2"</literal>, <literal>"clcg4"</literal>, <literal>"urand"</literal>.
                         Notice that this call returns the new current generator, i.e. <varname>gen</varname>.
                     </para>
                 </listitem>
                 <term>action = "getsd"</term>
                 <listitem>
                     <para>
-                        <code>S = grand("getsd")</code> gets the current state (the current seeds) of the current base
-                        generator ; <varname>S</varname> is given as a column vector (of integers) of dimension <literal>625</literal>
-                        for mt (the first being an index in <literal>[1,624]</literal>), <literal>4</literal> for kiss, <literal>2</literal>
-                        for clcg2,  <literal>4</literal> for clcg4
-                        (for this last one you get the current state of the current virtual generator) and <literal>1</literal>
-                        for urand.
+                        <code>S = grand("getsd")</code> gets the current state (the current seeds) of
+                        the current base generator ; <varname>S</varname> is given as a column vector
+                        (of integers) of dimension <literal>625</literal> for mt (the first being
+                        an index in <literal>[1,624]</literal>), <literal>4</literal> for kiss,
+                        <literal>2</literal> for clcg2,  <literal>4</literal> for clcg4 (for this
+                        last one you get the current state of the current virtual generator) and
+                        <literal>1</literal> for urand.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>action = "setsd"</term>
                 <listitem>
                     <para>
-                        <code>grand("setsd", S)</code> and <code>grand("setsd", s1[, s2, s3, s4])</code> set the state of the current
-                        base generator (the new seeds) :
+                        <code>grand("setsd", S)</code> and <code>grand("setsd", s1[, s2, s3, s4])</code>
+                        set the state of the current  base generator (the new seeds) :
                     </para>
                     <variablelist>
                         <varlistentry>
                             <term>for kiss</term>
                             <listitem>
                                 <para>
-                                    four integers <varname>s1</varname>, <varname>s2</varname>, <varname>s3</varname>, <varname>s4</varname> in <literal>[0,2^32[</literal> must be provided ;
+                                    four integers <varname>s1</varname>, <varname>s2</varname>,
+                                    <varname>s3</varname>, <varname>s4</varname> in
+                                    <literal>[0,2^32[</literal> must be provided ;
                                 </para>
                             </listitem>
                         </varlistentry>
                                 </para>
                                 <para>
                                     <caution>
-                                        CAUTION : with clcg4 you set the seeds of the current virtual
+                                        With clcg4 you set the seeds of the current virtual
                                         generator but you may lost the synchronization between this one
                                         and the others virtual generators (i.e. the sequence generated
                                         is not warranty to be non-overlapping with a sequence generated
index 53321de..03e1372 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="fr" xml:id="grand">
+<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="grand">
     <refnamediv>
         <refname>grand</refname>
         <refpurpose>Générateur de nombres pseudo-aléatoires</refpurpose>
             Y = grand(m, n, o,..,"..",...)
             Y = grand(X, ...)
         </synopsis>
-
+        <para/>
         <synopsis>
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
         </synopsis>
-
+        <para/>
         <synopsis>
             S = grand("getgen")
             grand("setgen", gen)
                     <para>
                         <literal>Y = grand(m, n, "bet", A, B)</literal> génère des nombres aléatoires suivant
                         la loi beta de paramètres <literal>A</literal> and <literal>B</literal>.
-                        La densité de cette loi est <latex><![CDATA[(0 < x < 1)]]></latex> :
+                        La densité de cette loi est (0 &lt; x &lt; 1) :
                     </para>
                     <para>
                         <latex>
                         </latex>
                     </para>
                     <para>
-                        <literal>A</literal> et <literal>B</literal> devant être des réels <latex><![CDATA[>10^{-37}]]></latex>.
+                        <literal>A</literal> et <literal>B</literal> devant être des réels >10<superscript>-37</superscript>.
                         Fonction(s) associée(s) : <link linkend="cdfbet">cdfbet</link>.
                     </para>
                 </listitem>
                         geométrique de paramètre <literal>p</literal> : nombre
                         d'épreuves de Bernouilli (de probabilité de succès
                         <literal>p</literal>) jusqu'à obtenir un succès
-                        (<literal>p</literal> doit appartenir à l'intervalle
-                        <latex>[p_{min},1]</latex> (avec <latex> p_{min} = 1{,}3\times 10^{-307} </latex>).
+                        (avec <varname>p</varname> dans [1.3e-307, 1]).
                     </para>
                     <para>
                         <literal>Y</literal> contient des nombres réels
                     <para>
                         <literal>Y = grand(m, n, "uin", Low, High)</literal> génère des entiers aléatoires suivant la loi uniforme
                         sur <literal>[Low, High]</literal>. <literal>High</literal>
-                        et <literal>Low</literal> doivent être des entiers tels que <literal>
-                            (High-Low+1)
-                            &lt; 2147483561
-                        </literal>
+                        et <literal>Low</literal> doivent être des entiers tels que
+                        <literal>(High-Low+1)  &lt; 2147483561</literal>
                         .
                     </para>
                 </listitem>
index c4e3e11..cb09011 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="grand">
+<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="grand">
     <refnamediv>
         <refname>grand</refname>
         <refpurpose>乱数生成器</refpurpose>
             Y = grand(m, n, o,..,"..",...)
             Y = grand(X, ...)
         </synopsis>
-
+        <para/>
         <synopsis>
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
         </synopsis>
-
+        <para/>
         <synopsis>
             S = grand("getgen")
             grand("setgen", gen)
                         <literal>Y=grand(m,n,'bet',A,B)</literal> は
                         パラメータ<literal>A</literal> およびd <literal>B</literal>
                         を指定したベータ分布からランダム変量を生成します.
-                        ベータ分布の密度は <latex><![CDATA[(0 < x < 1)]]></latex> です:
+                        ベータ分布の密度は (0 &lt; x &lt; 1) です:
                     </para>
                     <latex>
                         \dfrac{x^{A-1}(1-x)^{B-1}}{\beta(A,B)}
                     </latex>
                     <para>
                         <literal>A</literal> および <literal>B</literal> は
-                        実数で <latex><![CDATA[>10^{-37}]]></latex>とします.  関係する関数は
+                        実数で >10<superscript>-37</superscript>とします.  関係する関数は
                         : <link linkend="cdfbet">cdfbet</link>です.
                     </para>
                 </listitem>
                         パラメータ<literal>p</literal>を指定した
                         幾何分布に基づくランダム変量を生成します:
                         (成功率<literal>p</literal>の)ベルヌーイ試行に1回成功するまでの回数.
-                        <literal>p</literal> は
-                        <latex>[p_{min},1]</latex> (<latex> p_{min} = 1{,}3\times 10^{-307} </latex>)の範囲とします.
+                        <literal>p</literal> は [1.3e-307,1]の範囲とします.
                     </para>
                     <para>
                         <literal>Y</literal> は整数の値を有する正の実数となり,
                         の範囲の一様分布に基づく
                         の整数のランダム変量を生成します.
                         <literal>High</literal> および
-                        <literal>Low</literal> は
-                        <latex><![CDATA[(\textrm{High}-\textrm{Low}+1) < 2\,147\,483\,561]]></latex>の
+                      <literal>Low</literal> は <literal>(High-Low+1) &lt; 2147483561</literal>の
                         範囲の整数とする必要があります.
                     </para>
                 </listitem>
index 0f8456a..46dd4df 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="ru" xml:id="grand">
+<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="grand">
     <refnamediv>
         <refname>grand</refname>
         <refpurpose>Случайные числа</refpurpose>
             Y = grand(m, n, o,..,"..",...)
             Y = grand(X, ...)
         </synopsis>
-
+        <para/>
         <synopsis>
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
         </synopsis>
-
+        <para/>
         <synopsis>
             S = grand("getgen")
             grand("setgen", gen)
             формируют матрицу размером <varname>m</varname> на <varname>n</varname>,
             элементы которой являются случайными числами.
 
-            Все эти последовательности вызова могут быть расширены для создания гиперматрицы случайных чисел, у которой более двух размерностей, определённых в виде целых чисел, перечисленных перед типом статистического распределения:
+            Все эти последовательности вызова могут быть расширены для создания гиперматрицы случайных чисел,
+            у которой более двух размерностей, определённых в виде целых чисел, перечисленных перед типом
+            статистического распределения:
         </para>
         <para>
             <programlisting role="no-scilab-exec"><![CDATA[
                     <para>
                         <code>Y = grand(m, n, "bet", A, B)</code> формирует случайные
                         реализации по бета-распределению с параметрами
-                        <varname>A</varname> и <varname>B</varname>.  Плотность бета-распределения лежит на интервале <latex><![CDATA[(0 < x < 1)]]></latex>:
+                        <varname>A</varname> и <varname>B</varname>.  Плотность бета-распределения лежит
+                        на интервале (0 &lt; x &lt; 1):
                     </para>
                     <para>
                         <latex>
                         </latex>
                     </para>
                     <para>
-                        <varname>A</varname> и <varname>B</varname> должны быть вещественными числами <latex><![CDATA[>10^{-37}]]></latex>. С этой функцией связана
+                        <varname>A</varname> и <varname>B</varname> должны быть вещественными числами
+                        >10<superscript>-37</superscript>. С этой функцией связана
                         функция <link linkend="cdfbet">cdfbet</link>.
                     </para>
                 </listitem>
                 <term>случайные перестановки</term>
                 <listitem>
                     <para>
-                        <code>Y = grand(n, "prm", vect)</code> формирует <varname>n</varname> случайных перестановок                     <varname>vect</varname>.
-                        <varname>vect</varname> может быть вектор-столбцов вещественных чисел или вектором, матрицей или гиперматрицей комплексных, целых, логических, полиномиальных или строковых значений; полной или разрежённой.
+                        <code>Y = grand(n, "prm", vect)</code> формирует <varname>n</varname> случайных перестановок <varname>vect</varname>.
+                        <varname>vect</varname> может быть вектор-столбцов вещественных чисел или вектором, матрицей или гиперматрицей
+                        комплексных, целых, логических, полиномиальных или строковых значений; полной или разрежённой.
                         Из-за стековой структуры, <varname>vect</varname> не должен и не может быть вектор-строкой.
                         Эта возможность перекрывает Matlab'овскую функцию <code>randperm()</code> поскольку
                         <code>randperm(n)</code> эквивалентно <code>grand(1,'prm',(1:n)')</code>,
                     <para>
                         <code>Y = grand(m, n, "uin", Low, High)</code> формирует случайные целые числа, равномерно распределённые между значениями
                         <varname>Low</varname> и <varname>High</varname> (включительно). <varname>High</varname> и <varname>Low</varname> должны быть
-                        такими целыми числами, что <latex><![CDATA[(\textrm{High}-\textrm{Low}+1) < 2\,147\,483\,561]]></latex>.
+                        такими целыми числами, что <literal>(High-Low+1) &lt; 2.147483561e9</literal>.
                     </para>
                 </listitem>
             </varlistentry>
@@ -897,7 +905,8 @@ grand(10,1,"uin",1,365)
 grand(12,"prm",(1:7)')
  ]]></programlisting>
         <para>
-            В следующем примере мы формируем гиперматрицу случайных чисел с "нормальным" распределением размерами <varname>10</varname> на <varname>10</varname> на <varname>10</varname> и строим гистограммы. Показываются первый и последний слои.
+            В следующем примере мы формируем гиперматрицу случайных чисел с "нормальным" распределением размерами <varname>10</varname>
+            на <varname>10</varname> на <varname>10</varname> и строим гистограммы. Показываются первый и последний слои.
         </para>
         <programlisting role="example"><![CDATA[
 // Возвращает гиперматрицу случайных чисел с нормальным
index 9f07602..d0e3099 100644 (file)
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *
+ * 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:ns4="http://www.w3.org/1999/xhtml"
     xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
index 7675d12..8083d04 100644 (file)
@@ -3,11 +3,14 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA -
  *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ * 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"
index a32715b..b393023 100644 (file)
@@ -3,11 +3,14 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA -
  *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ * 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"