help pages: misc. small fixes and improvements 02/18802/18
Samuel GOUGEON [Mon, 19 Dec 2016 18:56:54 +0000 (19:56 +0100)]
 * dneupd, dseupd, zneupd: better management of broken argins list
 * left.xml superseeded by brackets.xml: removed
 * newaxes(h) updated in ja, pt, ru
 * Multiple synopses merged: newaxes, uiDeleteNode, uiFindNode,
   uiGetChildrenNode, uiGetParentNode, uiInsertNode, historysize,
   nicholschart, load
 * consolebox: reference to F12 key added
 * tohome improved (description was ambiguous/unclear)
 * ismatrix improved. Description for hypermat was incorrect
   (not limited to only 3 dimensions).
 * misc. typos fixed

Change-Id: Ib9b05261e88a13df4c5bce9a258ff6e0e96bdce3

85 files changed:
scilab/modules/arnoldi/help/en_US/dneupd.xml
scilab/modules/arnoldi/help/en_US/dseupd.xml
scilab/modules/arnoldi/help/en_US/zneupd.xml
scilab/modules/arnoldi/help/ja_JP/dneupd.xml
scilab/modules/arnoldi/help/ja_JP/dseupd.xml
scilab/modules/arnoldi/help/ja_JP/zneupd.xml
scilab/modules/cacsd/help/en_US/linear_analysis/freq_domain/nicholschart.xml
scilab/modules/cacsd/help/fr_FR/linear_analysis/freq_domain/nicholschart.xml
scilab/modules/cacsd/help/ja_JP/linear_analysis/freq_domain/nicholschart.xml
scilab/modules/cacsd/help/pt_BR/linear_analysis/freq_domain/nicholschart.xml
scilab/modules/cacsd/help/ru_RU/linear_analysis/freq_domain/nicholschart.xml
scilab/modules/console/help/en_US/tohome.xml
scilab/modules/console/help/fr_FR/tohome.xml
scilab/modules/core/help/en_US/1_keywords/symbols.xml
scilab/modules/core/help/en_US/scilab.xml
scilab/modules/core/help/fr_FR/1_keywords/left.xml [deleted file]
scilab/modules/core/help/fr_FR/1_keywords/symbols.xml
scilab/modules/core/help/fr_FR/scilab.xml
scilab/modules/core/help/ja_JP/1_keywords/left.xml [deleted file]
scilab/modules/core/help/ja_JP/1_keywords/symbols.xml
scilab/modules/core/help/ja_JP/scilab.xml
scilab/modules/core/help/pt_BR/1_keywords/left.xml [deleted file]
scilab/modules/core/help/pt_BR/1_keywords/symbols.xml
scilab/modules/core/help/ru_RU/1_keywords/left.xml [deleted file]
scilab/modules/core/help/ru_RU/1_keywords/symbols.xml
scilab/modules/core/help/ru_RU/scilab.xml
scilab/modules/differential_equations/help/en_US/bvode.xml
scilab/modules/differential_equations/help/ja_JP/bvode.xml
scilab/modules/differential_equations/help/ru_RU/bvode.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/empty.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/linspace.xml
scilab/modules/elementary_functions/help/en_US/ismatrix.xml
scilab/modules/elementary_functions/help/en_US/modulo.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/empty.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/linspace.xml
scilab/modules/elementary_functions/help/fr_FR/modulo.xml
scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/empty.xml
scilab/modules/elementary_functions/help/ja_JP/ismatrix.xml
scilab/modules/elementary_functions/help/ja_JP/modulo.xml
scilab/modules/elementary_functions/help/pt_BR/elementarymatrices/empty.xml
scilab/modules/elementary_functions/help/pt_BR/modulo.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/empty.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/linspace.xml
scilab/modules/elementary_functions/help/ru_RU/modulo.xml
scilab/modules/functions/help/en_US/macr2tree.xml
scilab/modules/functions/help/en_US/tree2code.xml
scilab/modules/functions/help/fr_FR/macr2tree.xml
scilab/modules/functions/help/ja_JP/macr2tree.xml
scilab/modules/functions/help/ja_JP/tree2code.xml
scilab/modules/functions/help/pt_BR/macr2tree.xml
scilab/modules/functions/help/pt_BR/tree2code.xml
scilab/modules/functions/help/ru_RU/macr2tree.xml
scilab/modules/functions/help/ru_RU/tree2code.xml
scilab/modules/graphics/help/en_US/axes_operations/newaxes.xml
scilab/modules/graphics/help/en_US/interaction/xclick.xml
scilab/modules/graphics/help/fr_FR/interaction/xclick.xml
scilab/modules/graphics/help/fr_FR/xset.xml
scilab/modules/graphics/help/ja_JP/axes_operations/newaxes.xml
scilab/modules/graphics/help/ja_JP/interaction/xclick.xml
scilab/modules/graphics/help/ja_JP/xset.xml
scilab/modules/graphics/help/pt_BR/axes_operations/newaxes.xml
scilab/modules/graphics/help/pt_BR/interaction/xclick.xml
scilab/modules/graphics/help/pt_BR/xset.xml
scilab/modules/gui/help/en_US/menus/addmenu.xml
scilab/modules/gui/help/en_US/menus/setmenu.xml
scilab/modules/gui/help/en_US/tree/uiDeleteNode.xml
scilab/modules/gui/help/en_US/tree/uiFindNode.xml
scilab/modules/gui/help/en_US/tree/uiGetChildrenNode.xml
scilab/modules/gui/help/en_US/tree/uiGetParentNode.xml
scilab/modules/gui/help/en_US/tree/uiInsertNode.xml
scilab/modules/gui/help/ja_JP/menus/addmenu.xml
scilab/modules/gui/help/ja_JP/tree/uiDeleteNode.xml
scilab/modules/gui/help/ja_JP/tree/uiFindNode.xml
scilab/modules/gui/help/ja_JP/tree/uiGetChildrenNode.xml
scilab/modules/gui/help/ja_JP/tree/uiGetParentNode.xml
scilab/modules/gui/help/ja_JP/tree/uiInsertNode.xml
scilab/modules/history_manager/help/en_US/historysize.xml
scilab/modules/history_manager/help/ja_JP/historysize.xml
scilab/modules/io/help/en_US/load.xml
scilab/modules/io/help/en_US/read.xml
scilab/modules/io/help/ja_JP/load.xml
scilab/modules/io/help/ja_JP/read.xml
scilab/modules/optimization/help/en_US/optim.xml
scilab/modules/windows_tools/help/en_US/consolebox.xml
scilab/modules/windows_tools/help/fr_FR/consolebox.xml

index 0c0ed17..0fbccf7 100644 (file)
@@ -14,8 +14,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [Dr, Di, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dneupd(RVEC, HOWMANY, SELECT, Dr, Di, Z, SIGMAr, SIGMAi, WORKev,
-            BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
+            [Dr, Di, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dneupd(RVEC, HOWMANY, SELECT, Dr, Di, Z, ...
+              .. SIGMAr, SIGMAi, WORKev, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index c8ce476..d674a8d 100644 (file)
@@ -14,8 +14,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [D, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dseupd(RVEC, HOWMANY, SELECT, D, Z, SIGMA, BMAT, N, WHICH,
-            NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
+            [D, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dseupd(RVEC, HOWMANY, SELECT, D, Z, ...
+                    .. SIGMA, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index ac37b5e..1495e8c 100644 (file)
@@ -14,8 +14,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [D, Z, RESID, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO] = zneupd(RVEC, HOWMANY, SELECT, D, Z, SIGMA, WORKev,
-            BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO)
+            [D, Z, RESID, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO] = zneupd(RVEC, HOWMANY, SELECT, D, Z, ...
+            .. SIGMA, WORKev, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 28e67b0..c996043 100644 (file)
@@ -14,8 +14,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [Dr, Di, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dneupd(RVEC, HOWMANY, SELECT, Dr, Di, Z, SIGMAr, SIGMAi, WORKev,
-            BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
+            [Dr, Di, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dneupd(RVEC, HOWMANY, SELECT, Dr, Di, Z, ...
+              .. SIGMAr, SIGMAi, WORKev, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index de3a50c..1bcbfe8 100644 (file)
@@ -13,8 +13,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [D, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dseupd(RVEC, HOWMANY, SELECT, D, Z, SIGMA, BMAT, N, WHICH,
-            NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
+            [D, Z, RESID, V, IPARAM, IPNTR, WORKD, WORKL, INFO] = dseupd(RVEC, HOWMANY, SELECT, D, Z, ...
+                    .. SIGMA, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, INFO)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 7c7d2a2..daf30a0 100644 (file)
@@ -13,8 +13,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [D, Z, RESID, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO] = zneupd(RVEC, HOWMANY, SELECT, D, Z, SIGMA, WORKev,
-            BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO)
+            [D, Z, RESID, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO] = zneupd(RVEC, HOWMANY, SELECT, D, Z, ...
+            .. SIGMA, WORKev, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, IPARAM, IPNTR, WORKD, WORKL, RWORK, INFO)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 7885abb..b00362a 100644 (file)
@@ -21,7 +21,6 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>nicholschart([modules] [,args] [,colors])</synopsis>
-        <synopsis/>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index bf44422..8f580b8 100644 (file)
@@ -21,7 +21,6 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>nicholschart([modules] [,args] [,colors])</synopsis>
-        <synopsis/>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index 2557eb9..1bc4668 100644 (file)
@@ -21,7 +21,6 @@
     <refsynopsisdiv>
         <title>呼び出し手順</title>
         <synopsis>nicholschart([modules] [,args] [,colors])</synopsis>
-        <synopsis/>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index 50ca8a9..7a91add 100644 (file)
@@ -21,7 +21,6 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>nicholschart([modules] [,args] [,colors])</synopsis>
-        <synopsis/>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index 0e6e2a7..2c78645 100644 (file)
@@ -21,7 +21,6 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>nicholschart([modules] [,args] [,colors])</synopsis>
-        <synopsis/>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index 3321237..5435d65 100644 (file)
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-    * Copyright (C) 2004-2007 - INRIA - Vincent COUVERT
-    *
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2004-2007 - INRIA - Vincent COUVERT
+ * Copyright (C) 2016 - Samuel GOUGEON
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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="tohome">
+<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="tohome">
     <refnamediv>
         <refname>tohome</refname>
-        <refpurpose>Move the cursor to the upper left corner of the Command Window</refpurpose>
+        <refpurpose>Clears the command window by masking its former content above the top</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>tohome()</synopsis>
+        <synopsis>tohome</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>tohome()</literal> moves the cursor to the upper-left corner of the Command Window and clears the screen.
+            <function>tohome</function> sets the commands prompt to the top of the command window,
+            followed by an empty space down to the bottom of the console.
         </para>
-        <para>You can use the scroll bar to see the history of previous functions.</para>
         <para>
-            <note>
-                Note that <literal>tohome()</literal> cannot be used under Windows platforms when Scilab used in no window mode.
-            </note>
+            Unlike <code>clc</code> that erases all preexisting execution results,
+            <function>tohome</function> keeps but rejects them above
+            the visible area of the console, and therefore masks them. It is still possible to see
+            former results by dragging the vertical scroll bar available in the right margin of the console.
         </para>
+        <note>
+          On MS Windows, <function>tohome</function> can only be used when Scilab
+          is launched in standard windowed mode (<code>getscilabmode()=="STD"</code>).
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
index 83e2908..b246ace 100644 (file)
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-    * Copyright (C) 2002-2007 - INRIA - Vincent COUVERT
-    *
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2002-2007 - INRIA - Vincent COUVERT
+ * Copyright (C) 2016 - Samuel GOUGEON
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * 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="tohome">
+<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="tohome">
     <refnamediv>
         <refname>tohome</refname>
-        <refpurpose>Déplace le curseur en haut à gauche de la fenêtre de commande</refpurpose>
+        <refpurpose>Efface la console en rejetant son contenu hors zone visible</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>tohome()</synopsis>
+        <synopsis>tohome</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>tohome()</literal> déplace le curseur en haut à gauche de la fenêtre de commande et efface l'écran.
+            <function>tohome</function> déplace l'invite de commande en haut de la fenêtre de commande,
+            suivie d'un espace vierge jusqu'en bas de console.
         </para>
-        <para>Vous pouvez utiliser la barre de défilement pour voir l'historique des fonctions.</para>
         <para>
-            <note>
-                Notez que <literal>tohome()</literal> ne peut être utilisé sous Windows quand Scilab est utilisé en mode sans fenêtre.
-            </note>
+            Contrairement à <code>clc</code> qui efface tous les résultats d'exécution
+            prééxistants, <function>tohome</function> conserve ceux-ci mais les rejette au dessus
+            de la zone visible de la console et donc les masque. Ils restent consultables
+            en utilisant la barre de défilement vertical en marge droite de la console.
         </para>
+        <note>
+          Sous Windows, <function>tohome</function> est utilisable uniquement lorsque Scilab
+          est lancé en mode fenêtré standard (<code>getscilabmode()=="STD"</code>).
+        </note>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
index e3f9334..6627eed 100644 (file)
@@ -40,7 +40,7 @@
             </tr>
             <tr>
                 <td>
-                    <literal>*,.*</literal>
+                    <literal>*, .*, *.</literal>
                 </td>
                 <td>
                     <link linkend="star">star</link>
             </tr>
             <tr>
                 <td>
-                    <literal>/, ./, /.</literal>
+                    <literal>.*.</literal>
+                </td>
+                <td>
+                    <link linkend="kron">kron</link>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <literal>/, ./, /., ./.</literal>
                 </td>
                 <td>
                     <link linkend="slash">slash</link>
             </tr>
             <tr>
                 <td>
-                    <literal>\,.\ ,\.</literal>
+                    <literal>//, /*  */</literal>
+                </td>
+                <td>
+                    <link linkend="comments">comments</link>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <literal>\,.\ ,\., .\.</literal>
                 </td>
                 <td>
                     <link linkend="backslash">backslash</link>
             </tr>
             <tr>
                 <td>
-                    <literal>.*., ./., .\.</literal>
-                </td>
-                <td>
-                    <link linkend="kron">kron</link>
-                </td>
-            </tr>
-            <tr>
-                <td>
                     <literal>$</literal>
                 </td>
                 <td>
index 3046f7f..71ad5fe 100644 (file)
@@ -45,7 +45,7 @@ scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
                      </para>
                      <para>
                       Example:
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
+                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
                         <programlisting><![CDATA[
 // Inside the opened session:
 a = sciargs()
@@ -222,20 +222,22 @@ evstr(a(i+2))*2
                     <para>If this option is present, Scilab is started as command line
                         with advanced features still available (graphics, export, xcos, scinotes, help browser, ...).
                     </para>
-                    <para>From Scilab 5.2:</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>pipes are enabled for all operating systems (see the
-                                examples for further details).
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>Scilab distribution also provides a dedicated binary which
-                                is doing the same as <literal>-nw</literal>:
-                                <literal>scilab-adv-cli</literal> (Scilab Advanced Command Line Interpreter).
-                            </para>
-                        </listitem>
-                    </itemizedlist>
+                    <para>
+                        From Scilab 5.2:
+                        <itemizedlist>
+                            <listitem>
+                                <para>pipes are enabled for all operating systems (see the
+                                    examples for further details).
+                                </para>
+                            </listitem>
+                            <listitem>
+                                <para>Scilab distribution also provides a dedicated binary which
+                                    is doing the same as <literal>-nw</literal>:
+                                    <literal>scilab-adv-cli</literal> (Scilab Advanced Command Line Interpreter).
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -243,28 +245,31 @@ evstr(a(i+2))*2
                 <listitem>
                     <important>
                         This mode prevents loading the Java Virtual Machine.
-                        It starts faster and uses less memory.
+                        It starts faster and uses less memory. But then...
                     </important>
-                    <para>If this option is present, Scilab is started as command line
-                        without advanced features (graphics, export, xcos, scinotes,
-                        help browser, Java module,...).
+                    <warning>
+                        Scilab is started as command line interpreter without any advanced features
+                        requiring the JVM: graphics, export, xcos, scinotes, help browser, other
+                        java interfaces, the Java module,... are not available.
+                    </warning>
+                    <para>
+                        Since Scilab 5.2:
+                        <itemizedlist>
+                            <listitem>
+                                <para>pipes are enabled for all operating systems (see the
+                                    examples for further details).
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                        <itemizedlist>
+                            <listitem>
+                                <para>Scilab distribution also provides a dedicated binary which
+                                    is doing the same as <literal>-nwni</literal>:
+                                    <literal>scilab-cli</literal> (Scilab Command Line Interpreter).
+                                </para>
+                            </listitem>
+                        </itemizedlist>
                     </para>
-                    <para>Since Scilab 5.2:</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>pipes are enabled for all operating systems (see the
-                                examples for further details).
-                            </para>
-                        </listitem>
-                    </itemizedlist>
-                    <itemizedlist>
-                        <listitem>
-                            <para>Scilab distribution also provides a dedicated binary which
-                                is doing the same as <literal>-nwni</literal>:
-                                <literal>scilab-cli</literal> (Scilab Command Line Interpreter).
-                            </para>
-                        </listitem>
-                    </itemizedlist>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -436,7 +441,7 @@ scilab -profiling
 
 # Let's start Scilab in debug mode without stopping after each SIGSEGV
 # First, we write a small command file
-echo "handle SIGSEGV nostop" &> debug.txt
+echo "handle SIGSEGV nostop" > debug.txt
 # Now set the custom option
 # We are under Bash shell
 export SCILAB_GDB_OPT="--command=debug.txt"
@@ -456,7 +461,7 @@ $ scilab -nw -e "help()"
 
 
 # Scilab can be used for scripting aspects:
-echo "if 1<>2 then exit(99) end"|scilab-cli
+echo "if 1&lt;>2 then exit(99) end"|scilab-cli
 echo $? ]]></screen>
     </refsection>
     <refsection role="see also">
diff --git a/scilab/modules/core/help/fr_FR/1_keywords/left.xml b/scilab/modules/core/help/fr_FR/1_keywords/left.xml
deleted file mode 100644 (file)
index 8b6d1be..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="left">
-    <refnamediv>
-        <refname>left ([)</refname>
-        <refpurpose>crochet gauche  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>[a11,a12,...;a21,a22,...;...]
-            [s1,s2,...]=func(...)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>a11,a12,...  </term>
-                <listitem>
-                    <para>
-                        toute matrice (réelle, complexe, polynomiale, rationnelle, liste de type <literal>syslin</literal> ...) de dimensions adéquate
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>s1,s2,...  </term>
-                <listitem>
-                    <para>noms de variables
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Les crochets droit et gauche sont utilisés pour effectuer une concaténation de matrices. Ces symboles sont aussi utilisés quand on effectue un appel à une fonction renvoyant plusieurs arguments.
-        </para>
-        <para>
-            A l'intérieur d'une paire de crochets spécifiant une concaténation, un espace ou une virgule signifient une concaténation de colonnes, alors qu'un point-virgule ou un passage à la ligne signifient une concaténation de lignes.
-        </para>
-        <para>
-            Note : pour éviter les confusions il est plus sûr d'utiliser des virgules pour concaténer des colonnes.
-        </para>
-        <para>
-            Pour des crochets entourant une liste d'arguments de sortie d'une fonction,
-            les noms de variables doivent être séparés par des virgules.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[
-[6.9,9.64; sqrt(-1) 0]
-[1 +%i  2 -%i  3]
-[]
-['ceci est';'un vecteur';'de chaines de caracteres']
-s=poly(0,'s');[1/s,2/s]
-[tf2ss(1/s),tf2ss(2/s)]
-
-[u,s]=schur(rand(3,3))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="comma">comma</link>
-            </member>
-            <member>
-                <link linkend="semicolon">semicolon</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 4cb5cc4..7436101 100644 (file)
                 </td>
             </tr>
             <tr>
-                <td> *,.*</td>
+                <td>*, .*, *.</td>
                 <td>
                     <link linkend="star">star</link>
                 </td>
             </tr>
             <tr>
-                <td> /, ./, /.</td>
+                <td> .*.</td>
+                <td>
+                    <link linkend="kron">kron</link>
+                </td>
+            </tr>
+            <tr>
+                <td>/, ./, /., ./.</td>
                 <td>
                     <link linkend="slash">slash</link>
                 </td>
             </tr>
             <tr>
-                <td> \,.\ ,\. </td>
+                <td>
+                    <literal>//, /*  */</literal>
+                </td>
+                <td>
+                    <link linkend="comments">commentaires</link>
+                </td>
+            </tr>
+            <tr>
+                <td>\, .\, \., .\.</td>
                 <td>
                     <link linkend="backslash">backslash</link>
                 </td>
                 </td>
             </tr>
             <tr>
-                <td> .*., ./., .\.</td>
-                <td>
-                    <link linkend="kron">kron</link>
-                </td>
-            </tr>
-            <tr>
                 <td>
                     <literal>$</literal>
                 </td>
index 5e1530c..f57ee2b 100644 (file)
@@ -45,7 +45,7 @@ scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
                      </para>
                      <para>
                       Exemple :
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\" ]]></screen>
+                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\" ]]></screen>
                         <programlisting><![CDATA[
 // Dans la session ouverte :
 a = sciargs()
@@ -232,22 +232,24 @@ evstr(a(i+2))*2
                         (graphiques, export, xcos, scinotes, navigateur d'aide,
                         module JIMS, etc).
                     </para>
-                    <para>A partir de la version 5.2 de Scilab:</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>La distribution de Scilab fournit aussi un binaire dédié
-                                faisant la même chose que l'option <emphasis>-nw</emphasis>:
-                                <emphasis>scilab-adv-cli</emphasis> (Scilab Advanced Command
-                                Line Interpreter).
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>Les fonctionnalités de pipe sont accessibles pour tous les
-                                systèmes d'exploitations (voir les examples pour plus de
-                                détails)
-                            </para>
-                        </listitem>
-                    </itemizedlist>
+                    <para>
+                        A partir de la version 5.2 de Scilab:
+                        <itemizedlist>
+                            <listitem>
+                                <para>La distribution de Scilab fournit aussi un binaire dédié
+                                    faisant la même chose que l'option <emphasis>-nw</emphasis>:
+                                    <emphasis>scilab-adv-cli</emphasis> (Scilab Advanced Command
+                                    Line Interpreter).
+                                </para>
+                            </listitem>
+                            <listitem>
+                                <para>Les fonctionnalités de pipe sont accessibles pour tous les
+                                    systèmes d'exploitations (voir les examples pour plus de
+                                    détails)
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -255,28 +257,33 @@ evstr(a(i+2))*2
                 <listitem>
                     <important>
                         Cette option supprime le chargement de la Machine Virtuelle Java en mémoire.
-                        Elle accélère le démarrage de Scilab et réduit la mémoire consommée.
+                        Elle accélère le démarrage de Scilab et réduit la mémoire consommée. Mais alors...
                     </important>
-                    <para>si cette option est présente, Scilab est lancé en tant
-                        qu'interprêteur de commandes (sans graphiques ni interfaces
-                        ni fonctionnalité de construction de l'aide, etc).
+                    <warning>
+                        Scilab est lancé en tant que simple interprêteur de commandes, sans aucune
+                        fonctionalité avancée requérant la JVM : les fonctionalités graphiques,
+                        les interfaces graphiques dont les navigateurs d'aide, de démos, de modules
+                        externes, de variables, l'éditeur Scinotes, le module "Java depuis Scilab"...
+                        ne sont pas disponibles dans ce mode.
+                    </warning>
+                    <para>
+                        A partir de la version 5.2 de Scilab:
+                        <itemizedlist>
+                            <listitem>
+                                <para>Les fonctionnalités de pipe sont accessibles pour tous les
+                                    systèmes d'exploitations (voir les exemples pour plus de
+                                    détails)
+                                </para>
+                            </listitem>
+                            <listitem>
+                                <para>La distribution de Scilab fournit aussi un binaire dédié
+                                    faisant la même chose que l'option <emphasis>-nw</emphasis>:
+                                    <emphasis>scilab-cli</emphasis> (Scilab Command Line
+                                    Interpreter).
+                                </para>
+                            </listitem>
+                        </itemizedlist>
                     </para>
-                    <para>A partir de la version 5.2 de Scilab:</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>Les fonctionnalités de pipe sont accessibles pour tous les
-                                systèmes d'exploitations (voir les exemples pour plus de
-                                détails)
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>La distribution de Scilab fournit aussi un binaire dédié
-                                faisant la même chose que l'option <emphasis>-nw</emphasis>:
-                                <emphasis>scilab-cli</emphasis> (Scilab Command Line
-                                Interpreter).
-                            </para>
-                        </listitem>
-                    </itemizedlist>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -450,7 +457,7 @@ scilab -profiling
 
 # Lançons Scilab en mode debug sans s'arrêter à chaque SIGSEGV
 # D'abord écrivons un petit fichier de commandes
-echo "handle SIGSEGV nostop" &amp;gt; debug.txt
+echo "handle SIGSEGV nostop" > debug.txt
 # On règle l'option de gdb
 # On est sous Bash
 export SCILAB_GDB_OPT="--command=debug.txt"
@@ -469,7 +476,7 @@ or
 $ scilab -nw -e "help()"
 
 # Scilab utilisé en tant que moteur de scripting
-echo "if 1&lt;&gt;2 then exit(99) end"|scilab-cli
+echo "if 1&lt;>2 then exit(99) end"|scilab-cli
 echo $? ]]></screen>
     </refsection>
     <refsection role="see also">
diff --git a/scilab/modules/core/help/ja_JP/1_keywords/left.xml b/scilab/modules/core/help/ja_JP/1_keywords/left.xml
deleted file mode 100644 (file)
index 023be58..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="left">
-    <refnamediv>
-        <refname>left</refname>
-        <refpurpose>([) 左括弧</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼出し手順</title>
-        <synopsis>[a11,a12,...;a21,a22,...;...]
-            [s1,s2,...]=func(...)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>a11,a12,...  </term>
-                <listitem>
-                    <para>
-                        互換性のある次元 s1,s2,... を有する任意の互換性のある型の行列 : 任意の変数名
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            左括弧および右括弧は,ベクトルおよび行列を結合する際に使用されます.
-            これらの記号は,関数コールの際に複数の左辺引数を定義する際に使用されます.
-        </para>
-        <para>
-            結合括弧の中で,空白またはカンマ文字は "列結合"を意味し,
-            セミコロンおよびキャレッジリターンは "行結合" を意味します.
-        </para>
-        <para>
-            注意 : 混乱を回避するため, 列を区切るために空白ではなくカンマを使用する
-            方がより安全でしょう.
-        </para>
-        <para>
-            複数の左辺引数の括弧の中では,変数名はカンマで区切る必要があります.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[
-[6.9,9.64; sqrt(-1) 0]
-[1 +%i  2 -%i  3]
-[]
-['this is';'a string';'vector']
-s=poly(0,'s');[1/s,2/s]
-[tf2ss(1/s),tf2ss(2/s)]
-[u,s]=schur(rand(3,3))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="comma">comma</link>
-            </member>
-            <member>
-                <link linkend="semicolon">semicolon</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 4d477b3..8daf171 100644 (file)
                 </td>
             </tr>
             <tr>
-                <td>*,.*</td>
+                <td>*, .*, *.</td>
                 <td>
                     <link linkend="star">star</link>
                 </td>
             </tr>
             <tr>
-                <td>/, ./, /.</td>
+                <td>.*.</td>
+                <td>
+                    <link linkend="kron">kron</link>
+                </td>
+            </tr>
+            <tr>
+                <td>/, ./, /., ./.</td>
                 <td>
                     <link linkend="slash">slash</link>
                 </td>
             </tr>
             <tr>
-                <td>\,.\ ,\.</td>
+                <td>
+                    <literal>//, /*  */</literal>
+                </td>
+                <td>
+                    <link linkend="comments">comments</link>
+                </td>
+            </tr>
+            <tr>
+                <td>\, .\, \., .\.</td>
                 <td>
                     <link linkend="backslash">backslash</link>
                 </td>
                 </td>
             </tr>
             <tr>
-                <td>.*., ./., .\.</td>
-                <td>
-                    <link linkend="kron">kron</link>
-                </td>
-            </tr>
-            <tr>
                 <td>
                     <literal>$</literal>
                 </td>
index 796fc37..6d91427 100644 (file)
@@ -46,7 +46,7 @@ scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
                      </para>
                      <para>
                       Example:
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
+                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
                         <programlisting><![CDATA[
 // Inside the opened session:
 a = sciargs()
@@ -459,7 +459,7 @@ export SCILAB_VALGRIND_OPT="--db-attach=no --log-file=myfile.txt"
 scilab -profiling
 # Let's start Scilab in debug mode without stopping after each SIGSEGV
 # First, we write a small command file
-echo "handle SIGSEGV nostop" &> debug.txt
+echo "handle SIGSEGV nostop" > debug.txt
 # Now set the custom option
 # We are under Bash shell
 export SCILAB_GDB_OPT="--command=debug.txt"
@@ -476,7 +476,7 @@ $ scilab-adv-cli -e "help()"
 or
 $ scilab -nw -e "help()"
 # Scilab can be used for scripting aspects:
-echo "if 1<>2 then exit(99) end"|scilab-cli
+echo "if 1&lt;>2 then exit(99) end"|scilab-cli
 echo $? ]]></screen>
     </refsection>
     <refsection role="see also">
diff --git a/scilab/modules/core/help/pt_BR/1_keywords/left.xml b/scilab/modules/core/help/pt_BR/1_keywords/left.xml
deleted file mode 100644 (file)
index df1521c..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="left" xml:lang="pt">
-    <refnamediv>
-        <refname>left</refname>
-        <refpurpose>([) colchete esquerdo</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>[a11,a12,...;a21,a22,...;...]
-            [s1,s2,...]=func(...)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>a11,a12,...</term>
-                <listitem>
-                    <para>matriz de qualquer tipo compatível com dimensões compatíveis.
-                        s1,s2,... : qualquer nome de variável possível
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>Colchetes esquerdo e direito são usados para concatenação de vetores
-            e matrizes. Estes símbolos também são utilizados para denotar um lado
-            esquerdo múltiplo para uma chamada de função.
-        </para>
-        <para>Dentro de colchetes de concatenação, espaços em branco ou vírgulas
-            significam "concatenação de colunas"; pontos-e-vírgulas e retornos de
-            carro significam "concatenação de linhas".
-        </para>
-        <para>Nota : para evitar confusões, é preferível que se use vírgula no
-            lugar de espaços em branco para separar colunas.
-        </para>
-        <para>Dentro de colchetes de lado esquerdo múltiplo, nomes de variáveis
-            devem ser separados por vírgula.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-[6.9,9.64; sqrt(-1) 0]
-[1 +%i  2 -%i  3]
-[]
-['this is';'a string';'vector']
-s=poly(0,'s');[1/s,2/s]
-[tf2ss(1/s),tf2ss(2/s)]
-
-[u,s]=schur(rand(3,3))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="comma">comma</link>
-            </member>
-            <member>
-                <link linkend="semicolon">semicolon</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 23af01d..233f293 100644 (file)
@@ -5,9 +5,9 @@
         <refpurpose>nomes dos operadores Scilab</refpurpose>
     </refnamediv>
     <refsection>
-        <title>Descrição</title>
-        <para>Use os nomes seguintes para obter ajuda em um símbolo
-            específico
+        <title>Descrição</title>
+        <para>Use os nomes seguintes para obter ajuda em um símbolo
+            específico
         </para>
         <informaltable border="1">
             <tr>
                 </td>
             </tr>
             <tr>
-                <td> *,.*</td>
+                <td> *, .*, *.</td>
                 <td>
-                    <link linkend="star">star</link> (estrela, asterísco)
+                    <link linkend="star">star</link> (estrela, asterísco)
                 </td>
             </tr>
             <tr>
-                <td> /, ./, /.</td>
+                <td> .*.</td>
+                <td>
+                    <link linkend="kron">kron</link> (produto de Kronecker)
+                </td>
+            </tr>
+            <tr>
+                <td> /, ./, /., ./.</td>
                 <td>
                     <link linkend="slash">slash</link> (barra)
                 </td>
             </tr>
             <tr>
-                <td> \,.\ ,\. </td>
+                <td>
+                    <literal>//, /*  */</literal>
+                </td>
+                <td>
+                    <link linkend="comments">comments</link>
+                </td>
+            </tr>
+            <tr>
+                <td> \, .\, \., .\. </td>
                 <td>
                     <link linkend="backslash">backslash</link> (barra invertida)
                 </td>
@@ -65,7 +79,7 @@
             <tr>
                 <td> &lt;,&gt;,&gt;=,&lt;=,&lt;&gt;</td>
                 <td>
-                    <link linkend="less">less</link>  (comparação "menor do que"), <link linkend="greater">greater</link> (comparação "maior do que")
+                    <link linkend="less">less</link>  (comparação "menor do que"), <link linkend="greater">greater</link> (comparação "maior do que")
                 </td>
             </tr>
             <tr>
@@ -83,7 +97,7 @@
             <tr>
                 <td> ()</td>
                 <td>
-                    <link linkend="parentheses">parentheses</link> (parênteses)
+                    <link linkend="parentheses">parentheses</link> (parênteses)
                 </td>
             </tr>
             <tr>
             <tr>
                 <td> ,</td>
                 <td>
-                    <link linkend="comma">comma</link> (vírgula)
+                    <link linkend="comma">comma</link> (vírgula)
                 </td>
             </tr>
             <tr>
                 <td> ;</td>
                 <td>
-                    <link linkend="semicolon">semicolon</link> (ponto-e-vírgula)
+                    <link linkend="semicolon">semicolon</link> (ponto-e-vírgula)
                 </td>
             </tr>
             <tr>
                     <literal>^</literal>
                 </td>
                 <td>
-                    <link linkend="hat">hat</link> (chapéu, circunflexo)
+                    <link linkend="hat">hat</link> (chapéu, circunflexo)
                 </td>
             </tr>
             <tr>
                     <literal>.^</literal>
                 </td>
                 <td>
-                    <link linkend="power">power</link> (potência)
+                    <link linkend="power">power</link> (potência)
                 </td>
             </tr>
             <tr>
                 <td> |</td>
                 <td>
-                    <link linkend="or_op">or_op</link> (barra vertical, "ou" lógico)
+                    <link linkend="or_op">or_op</link> (barra vertical, "ou" lógico)
                 </td>
             </tr>
             <tr>
                 <td> &amp;</td>
                 <td>
-                    <link linkend="and_op">and_op</link> ("e" comercial, "e" lógico)
-                </td>
-            </tr>
-            <tr>
-                <td> .*., ./., .\.</td>
-                <td>
-                    <link linkend="kron">kron</link> (produto de Kronecker)
+                    <link linkend="and_op">and_op</link> ("e" comercial, "e" lógico)
                 </td>
             </tr>
             <tr>
         </informaltable>
     </refsection>
     <refsection>
-        <title> Observações</title>
-        <para>Por razões históricas, símbolos diferentes podem representar o mesmo
+        <title> Observações</title>
+        <para>Por razões históricas, símbolos diferentes podem representar o mesmo
             operador:
         </para>
         <para>
         <para>
             <literal>`</literal> tem o mesmo significado que &lt;
         </para>
-        <para>É altamente recomendável que não se use esses recursos, pois eles
-            serão removidos futuramente
+        <para>É altamente recomendável que não se use esses recursos, pois eles
+            serão removidos futuramente
         </para>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="overloading">overloading</link>
diff --git a/scilab/modules/core/help/ru_RU/1_keywords/left.xml b/scilab/modules/core/help/ru_RU/1_keywords/left.xml
deleted file mode 100644 (file)
index 6321299..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="left">
-    <refnamediv>
-        <refname>left</refname>
-        <refpurpose>([) left bracket</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Синтаксис</title>
-        <synopsis>[a11,a12,...;a21,a22,...;...]
-            [s1,s2,...]=func(...)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>a11,a12,...  </term>
-                <listitem>
-                    <para>matrix of any compatibles types with compatibles dimensions s1,s2,... : any possible variable name</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Left and right brackets are used for vector and matrix concatenation.
-            These symbols are also used to denote a multiple left-hand-side for a function call
-        </para>
-        <para>
-            Inside concatenation brackets blank or comma characters mean "column concatenation",
-            semicolon and carriage-return mean "row concatenation".
-        </para>
-        <para>
-            Note : to avoid confusions it is safer to use comma instead of blank to
-            separate columns.
-        </para>
-        <para>
-            Within multiple lhs brackets variable names must be separated by comma.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[
-[6.9,9.64; sqrt(-1) 0]
-[1 +%i  2 -%i  3]
-[]
-['this is';'a string';'vector']
-s=poly(0,'s');[1/s,2/s]
-[tf2ss(1/s),tf2ss(2/s)]
-
-[u,s]=schur(rand(3,3))
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="comma">comma</link>
-            </member>
-            <member>
-                <link linkend="semicolon">semicolon</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index af0caeb..de25a2f 100644 (file)
@@ -15,7 +15,7 @@
                 <td>название в справке Scilab'а</td>
             </tr>
             <tr>
-                <td> ',", .'</td>
+                <td> ', ", .'</td>
                 <td>
                     <link linkend="quote">quote</link>
                 </td>
                 </td>
             </tr>
             <tr>
-                <td> *,.*</td>
+                <td> *, .*, *.</td>
                 <td>
                     <link linkend="star">star</link>
                 </td>
             </tr>
             <tr>
-                <td> /, ./, /.</td>
+                <td> .*.</td>
+                <td>
+                    <link linkend="kron">kron</link>
+                </td>
+            </tr>
+            <tr>
+                <td> /, ./, /., ./.</td>
                 <td>
                     <link linkend="slash">slash</link>
                 </td>
             </tr>
             <tr>
-                <td> \,.\ ,\. </td>
+                <td>
+                    <literal>//, /*  */</literal>
+                </td>
+                <td>
+                    <link linkend="comments">comments</link>
+                </td>
+            </tr>
+            <tr>
+                <td> \, .\, \., .\. </td>
                 <td>
                     <link linkend="backslash">backslash</link>
                 </td>
                 </td>
             </tr>
             <tr>
-                <td> .*., ./., .\.</td>
-                <td>
-                    <link linkend="kron">kron</link>
-                </td>
-            </tr>
-            <tr>
                 <td>
                     <literal>$</literal>
                 </td>
index 810ca7b..9e755d8 100644 (file)
@@ -50,7 +50,7 @@ scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
                      </para>
                      <para>
                       Пример:
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -args "Привет, \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
+                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Привет, \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
                         <programlisting><![CDATA[
 // Внутри открытой сессии:
 a = sciargs()
@@ -235,22 +235,24 @@ evstr(a(i+2))*2
                     <para>
                         Если есть эта опция,то Scilab запускается как командная строка с улучшенными возможностями (графические окна, экспорт, xcos, scinotes, справочная система, ...).
                     </para>
-                    <para>Начиная с Scilab 5.2:</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>
-                                конвейеры доступны во всех операционных системах (см. примеры для дополнительной
-                                информации).
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                Дистрибутив Scilab также предоставляет специальный бинарный файл, который
-                                делает то же, что и <literal>-nw</literal>: <literal>scilab-adv-cli</literal>
-                                (Интерпретатор Scilab с улучшенной командной строкой).
-                            </para>
-                        </listitem>
-                    </itemizedlist>
+                    <para>
+                        Начиная с Scilab 5.2:
+                        <itemizedlist>
+                            <listitem>
+                                <para>
+                                    конвейеры доступны во всех операционных системах (см. примеры для дополнительной
+                                    информации).
+                                </para>
+                            </listitem>
+                            <listitem>
+                                <para>
+                                    Дистрибутив Scilab также предоставляет специальный бинарный файл, который
+                                    делает то же, что и <literal>-nw</literal>: <literal>scilab-adv-cli</literal>
+                                    (Интерпретатор Scilab с улучшенной командной строкой).
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -259,25 +261,27 @@ evstr(a(i+2))*2
                     <important>
                         Этот режим не загружает виртуальную машину Java (быстрее загружается и использует меньше памяти).
                     </important>
-                    <para>
+                    <warning>
                         Если есть эта опция, то Scilab запускается как командная строка без улучшенных возможностей (графических окон, экспорта, xcos, scinotes, справочной системы, ...).
-                    </para>
-                    <para>Начиная с Scilab 5.2:</para>
-                    <itemizedlist>
-                        <listitem>
+                    </warning>
+                    <para>
+                        Начиная с Scilab 5.2:
+                        <itemizedlist>
+                          <listitem>
                             <para>
-                                конвейеры доступны во всех операционных системах (см. примеры для дополнительной
-                                информации).
+                              конвейеры доступны во всех операционных системах (см. примеры для дополнительной
+                              информации).
                             </para>
-                        </listitem>
-                        <listitem>
+                          </listitem>
+                          <listitem>
                             <para>
-                                Дистрибутив Scilab также предоставляет специальный бинарный файл, который
-                                делает то же, что и <literal>-nwni</literal>: <literal>scilab-cli</literal>
-                                (Интерпретатор Scilab с улучшенной командной строкой).
+                              Дистрибутив Scilab также предоставляет специальный бинарный файл, который
+                              делает то же, что и <literal>-nwni</literal>: <literal>scilab-cli</literal>
+                              (Интерпретатор Scilab с улучшенной командной строкой).
                             </para>
-                        </listitem>
-                    </itemizedlist>
+                          </listitem>
+                        </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -466,7 +470,7 @@ scilab -profiling
 
 # Запустим Scilab в режиме отладки без остановки после каждого SIGSEGV
 # Сначала запишем небольшой файл команд
-echo "handle SIGSEGV nostop" &> debug.txt
+echo "handle SIGSEGV nostop" > debug.txt
 # Теперь установим пользовательские опции
 # Мы находимся в оболочке Bash
 export SCILAB_GDB_OPT="--command=debug.txt"
@@ -486,7 +490,7 @@ $ scilab -nw -e "help()"
 
 
 # Scilab может быть использован написания сценариев:
-echo "if 1<>2 then exit(99) end"|scilab-cli
+echo "if 1&lt;>2 then exit(99) end"|scilab-cli
 echo $? ]]></screen>
     </refsection>
     <refsection role="see also">
index 2f1dd5e..9f5909e 100644 (file)
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            zu=bvode(xpoints,N,m,x_low,x_up,zeta,ipar,ltol,tol,fixpnt,fsub,dfsub,gsub,dgsub,guess)
+            zu = bvode(xpoints,N,m,x_low,x_up,zeta,ipar,ltol,tol,fixpnt,fsub,dfsub,gsub,dgsub,guess)
         </synopsis>
+      <para></para>
         <synopsis>
-            zu=bvodeS(xpoints,m,N,x_low,x_up,fsub,gsub,zeta, &lt;optional_args&gt;)
+            zu = bvodeS(xpoints,m,N,x_low,x_up,fsub,gsub,zeta, &lt;optional_args&gt;)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 739748c..4e4d735 100644 (file)
 
         <synopsis>
 
-            zu=bvode(xpoints,N,m,x_low,x_up,zeta,ipar,ltol,tol,fixpnt,fsub,dfsub,gsub,dgsub,guess)
+            zu = bvode(xpoints,N,m,x_low,x_up,zeta,ipar,ltol,tol,fixpnt,fsub,dfsub,gsub,dgsub,guess)
 
         </synopsis>
-
+      <para></para>
         <synopsis>
 
-            zu=bvodeS(xpoints,m,N,x_low,x_up,fsub,gsub,zeta, &lt;optional_args&gt;)
+            zu = bvodeS(xpoints,m,N,x_low,x_up,fsub,gsub,zeta, &lt;optional_args&gt;)
 
         </synopsis>
 
index 3f14cbb..18be7df 100644 (file)
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            zu=bvode(xpoints,N,m,x_low,x_up,zeta,ipar,ltol,tol,fixpnt,fsub,dfsub,gsub,dgsub,guess)
+            zu = bvode(xpoints,N,m,x_low,x_up,zeta,ipar,ltol,tol,fixpnt,fsub,dfsub,gsub,dgsub,guess)
         </synopsis>
+        <para></para>
         <synopsis>
-            zu=bvodeS(xpoints,m,N,x_low,x_up,fsub,gsub,zeta, &lt;optional_args&gt;)
+            zu = bvodeS(xpoints,m,N,x_low,x_up,fsub,gsub,zeta, &lt;optional_args&gt;)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 8ccdfec..adbbeb6 100644 (file)
             <literal> [] * A = A * [] = [] </literal>
         </para>
         <para>
-            <literal> [] + A = A + [] = []</literal>
+            <literal> [] + A = A + [] = [] </literal>
         </para>
         <para>
-            <literal>[ [], A] = [A, []] = A </literal>
-            <literal> inv([]) =[] </literal>
+            <literal> [ [], A] = [A, []] = A </literal>
         </para>
         <para>
-            <literal> det([])=cond([])=rcond([])=1, rank([])=0</literal>
+            <literal> inv([]) = [] </literal>
+        </para>
+        <para>
+            <literal> det([]) = cond([]) = rcond([]) = 1</literal>
+        </para>
+        <para>
+            <literal> rank([]) = 0 </literal>
         </para>
         <para>
             Matrix functions return <literal>[]</literal> or an error message
index 5a9ab0c..8fa81d3 100644 (file)
@@ -129,25 +129,21 @@ linspace([1:4]', [5:8]', 10)   // with input columns
     []
 
 --> linspace(1, 2, 10)    // x2 > x1 : increasing values
-
  ans  =
    1.   1.111   1.222   1.333   1.444   1.556   1.667   1.778   1.889   2.
 
 
---> linspace(2, 1, 10)    // x2 < x1 : decreasing values
-
+--> linspace(2, 1, 10)    // x2 &lt; x1 : decreasing values
  ans  =
    2.   1.889   1.778   1.667   1.556   1.444   1.333   1.222   1.111   1.
 
 
 --> linspace(1+%i, 2-2*%i, 5)      // with complex numbers
-
  ans  =
    1. +i     1.25 +0.25i   1.5 -0.5i   1.75 -1.25i   2. -2.i
 
 
 --> linspace([1:4]', [5:8]', 10)   // with input columns
-
  ans  =
    1.   1.444   1.889   2.333   2.778   3.222   3.667   4.111   4.556   5.
    2.   2.444   2.889   3.333   3.778   4.222   4.667   5.111   5.556   6.
index b122091..0e15022 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="ismatrix" 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="ismatrix" xml:lang="en">
     <refnamediv>
         <refname>ismatrix</refname>
-        <refpurpose>check if a variable is a matrix</refpurpose>
+        <refpurpose>checks if an object is a non-empty 1D or 2D matrix or array</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>t=ismatrix(x)</synopsis>
+        <synopsis>tf = ismatrix(x)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>scalar,vector, matrix, hypermatrix, list, array of structures or cells</para>
+                    <para>scalar,vector, matrix, hypermatrix, list, array of structures or of cells</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>t</term>
+                <term>tf</term>
                 <listitem>
                     <para>a boolean</para>
                 </listitem>
             <literal>
                 ismatrix(<varname>x</varname>)
             </literal>
-            returns true if <varname>x</varname>
-            is a matrix. Scalars and vectors are considered as matrix, and it is the same for
-            hypermatrix only if one of its three dimensions equals to 1.
-        </para>
-        <para>
-            <note>
-                Note that <literal>matrix([])</literal> returns false.
-            </note>
+            returns <literal>%T</literal> (true) if <varname>x</varname>
+            is a scalar (single component), or a vector or a matrix or array with one or 2 dimensions.
         </para>
+        <note>
+          <itemizedlist>
+            <listitem>
+               An hypermatrix that would be a matrix after reordering its dimensions is
+               considered as a matrix.
+            </listitem>
+            <listitem>
+              To test that <varname>x</varname> is not an hypermatrix or an hyperarray -- whatever
+              are the sizes of its dimensions --, use simply <literal>ndims(x)&lt;3</literal>.
+            </listitem>
+            <listitem>
+              <literal>matrix([])</literal> returns false.
+            </listitem>
+          </itemizedlist>
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -109,6 +121,9 @@ ismatrix(s) // 3D (cubic) array of structures
             <member>
                 <link linkend="isempty">isempty</link>
             </member>
+            <member>
+                <link linkend="ndims">ndims</link>
+            </member>
         </simplelist>
     </refsection>
     <refsection>
index eb5e88d..e61b01f 100644 (file)
@@ -26,6 +26,7 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>i = modulo(n,m)</synopsis>
+      <para></para>
         <synopsis>i = pmodulo(n,m)</synopsis>
     </refsynopsisdiv>
     <refsection>
index dc0a995..e2493a2 100644 (file)
@@ -8,7 +8,7 @@
         <title>Description</title>
         <para>
             <literal> [] </literal> désigne une matrice vide. Elle est définie de façon unique et possède
-            0 lignes et 0 colonnes, soit <literal> size([]) =[0,0] </literal>.
+            0 ligne et 0 colonne, soit <literal> size([]) = [0,0] </literal>.
             Les convention suivantes sont adoptées :
         </para>
         <para>
         </para>
         <para>
             <literal> [ [], A] = [A, []] = A </literal>
-            <literal> inv([]) =[] </literal>
         </para>
         <para>
-            <literal> det([])=cond([])=rcond([])=1, rank([])=0 </literal>
+            <literal> inv([]) = [] </literal>
+        </para>
+        <para>
+            <literal> det([]) = cond([]) = rcond([]) = 1</literal>
+        </para>
+        <para>
+            <literal> rank([]) = 0 </literal>
         </para>
         <para>
             Les fonctions matricielles renvoient <literal>[]</literal> ou un message d'erreur
index 69ff411..0ba9164 100644 (file)
@@ -134,25 +134,21 @@ linspace([1:4]', [5:8]', 10)   // avec des colonnes de bornes
     []
 
 --> linspace(1, 2, 10)    // x2 > x1 : suite croissante
-
  ans  =
    1.   1.111   1.222   1.333   1.444   1.556   1.667   1.778   1.889   2.
 
 
---> linspace(2, 1, 10)    // x2 < x1 : suite décroissante
-
+--> linspace(2, 1, 10)    // x2 &lt; x1 : suite décroissante
  ans  =
    2.   1.889   1.778   1.667   1.556   1.444   1.333   1.222   1.111   1.
 
 
 --> linspace(1+%i, 2-2*%i, 5)      // avec des nombres complexes
-
  ans  =
    1. +i     1.25 +0.25i   1.5 -0.5i   1.75 -1.25i   2. -2.i
 
 
 --> linspace([1:4]', [5:8]', 10)   // avec des colonnes de bornes
-
  ans  =
    1.   1.444   1.889   2.333   2.778   3.222   3.667   4.111   4.556   5.
    2.   2.444   2.889   3.333   3.778   4.222   4.667   5.111   5.556   6.
index 539e4bd..7dd1b2c 100644 (file)
@@ -17,7 +17,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="modulo" xml:lang="fr">
     <refnamediv>
         <refname>modulo</refname>
-        <refpurpose>reste symétrique modulo m ayant le signe du dividande</refpurpose>
+        <refpurpose>reste symétrique modulo m ayant le signe du dividende</refpurpose>
     </refnamediv>
     <refnamediv xml:id="pmodulo">
         <refname>pmodulo</refname>
@@ -26,6 +26,7 @@
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
         <synopsis>i = modulo(n,m)</synopsis>
+        <para></para>
         <synopsis>i = pmodulo(n,m)</synopsis>
     </refsynopsisdiv>
     <refsection>
index 004c71d..b55b94a 100644 (file)
             <literal> [] * A = A * [] = [] </literal>
         </para>
         <para>
-            <literal> [] + A = A + [] = []</literal>
+            <literal> [] + A = A + [] = [] </literal>
         </para>
         <para>
-            [ [], A] = [A, []] = A
-            <literal> inv([]) =[] </literal>
+            <literal> [ [], A] = [A, []] = A </literal>
         </para>
         <para>
-            <literal> det([])=cond([])=rcond([])=1, rank([])=0</literal>
+            <literal> inv([]) = [] </literal>
+        </para>
+        <para>
+            <literal> det([]) = cond([]) = rcond([]) = 1</literal>
+        </para>
+        <para>
+            <literal> rank([]) = 0 </literal>
         </para>
         <para>
             明示的な答えがない場合,行列関数は <literal>[]</literal> またはエラーメッセージを
index 418acdd..b73fc47 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="ismatrix" 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="ismatrix" xml:lang="ja">
 
     <refnamediv>
 
@@ -29,7 +32,7 @@
 
         <title>呼び出し手順</title>
 
-        <synopsis>t=ismatrix(x)</synopsis>
+        <synopsis>tf = ismatrix(x)</synopsis>
 
     </refsynopsisdiv>
 
@@ -53,7 +56,7 @@
 
             <varlistentry>
 
-                <term>t</term>
+                <term>tf</term>
 
                 <listitem>
 
                 ismatrix(<varname>x</varname>)
 
             </literal>
-
             は,
-
             <varname>x</varname>が行列の場合にtrueを返します.
-
-            スカラーとベクトルは行列とみなされます,
-
-            これは3次元の1つが1の場合のみハイパー行列の場合も同じです.
-
-            <literal>matrix([])</literal>はfalseを返します.
-
+            スカラーとベクトルは行列とみなされます.
         </para>
-
+        <note>
+          <itemizedlist>
+            <listitem>
+               An hypermatrix H that would be a matrix after reordering its dimensions is
+               considered as a matrix, and <literal>ismatrix(H)</literal> returns <constant>%T</constant>.
+            </listitem>
+            <listitem>
+              To test that <varname>x</varname> is not an hypermatrix or an hyperarray -- whatever
+              are the sizes of its dimensions --, use simply <literal>ndims(x)&lt;3</literal>.
+            </listitem>
+            <listitem>
+              <literal>matrix([])</literal>はfalseを返します.
+            </listitem>
+          </itemizedlist>
+        </note>
     </refsection>
 
     <refsection>
@@ -164,9 +173,10 @@ ismatrix(s) // 構造体の3次元 (立法)配列
             </member>
 
             <member>
-
                 <link linkend="isempty">isempty</link>
-
+            </member>
+            <member>
+                <link linkend="ndims">ndims</link>
             </member>
 
         </simplelist>
index ad4d1cf..e9be42e 100644 (file)
@@ -26,6 +26,7 @@
     <refsynopsisdiv>
         <title>呼出し手順</title>
         <synopsis>i = modulo(n,m)</synopsis>
+        <para></para>
         <synopsis>i = pmodulo(n,m)</synopsis>
     </refsynopsisdiv>
     <refsection>
index 308a12e..077c92d 100644 (file)
@@ -5,29 +5,35 @@
         <refpurpose>([]) matriz vazia</refpurpose>
     </refnamediv>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            <literal> [] </literal> denota a matriz vazia. É definida de modo
-            único e possui 0 linha e 0 coluna, i.e. <literal> size([]) =[0,0]
+            <literal> [] </literal> denota a matriz vazia. É definida de modo
+            único e possui 0 linha e 0 coluna, i.e. <literal> size([]) =[0,0]
             </literal>
-            .As seguintes convenções convenientes foram feitas:
+            .As seguintes convenções convenientes foram feitas:
         </para>
         <para>
             <literal> [] * A = A * [] = [] </literal>
         </para>
         <para>
-            <literal> [] + A = A + [] = []</literal>
+            <literal> [] + A = A + [] = [] </literal>
         </para>
         <para>
-            [ [], A] = [A, []] = A <literal> inv([]) =[] </literal>
+            <literal> [ [], A] = [A, []] = A </literal>
         </para>
         <para>
-            <literal> det([])=cond([])=rcond([])=1, rank([])=0</literal>
+            <literal> inv([]) = [] </literal>
         </para>
         <para>
-            Funções de matrizes retornam <literal>[]</literal> ou produzem uma
-            mensagem de erro quando não há resposta óbvia. Sistemas lineares vazios
-            (listas<literal> syslin</literal>) podem ter várias linhas ou
+            <literal> det([]) = cond([]) = rcond([]) = 1</literal>
+        </para>
+        <para>
+            <literal> rank([]) = 0 </literal>
+        </para>
+        <para>
+            Funções de matrizes retornam <literal>[]</literal> ou produzem uma
+            mensagem de erro quando não há resposta óbvia. Sistemas lineares vazios
+            (listas<literal> syslin</literal>) podem ter várias linhas ou
             colunas.
         </para>
     </refsection>
@@ -46,7 +52,7 @@ size(wr), w1=ss2tf(wr), size(w1)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="matrices">matrices</link>
index b31e806..3c91578 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="modulo" xml:lang="pt">
     <refnamediv>
         <refname>modulo</refname>
-        <refpurpose>Resto aritmético simétrico da divisão de n por m</refpurpose>
+        <refpurpose>Resto aritmético simétrico da divisão de n por m</refpurpose>
     </refnamediv>
     <refnamediv xml:id="pmodulo">
         <refname>pmodulo</refname>
-        <refpurpose>Resto aritmético positivo da divisão de n por m</refpurpose>
+        <refpurpose>Resto aritmético positivo da divisão de n por m</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>i=modulo(n,m)</synopsis>
-        <synopsis>i=pmodulo(n,m)</synopsis>
+        <title>Seqüência de Chamamento</title>
+        <synopsis>i = modulo(n,m)</synopsis>
+        <para></para>
+        <synopsis>i = pmodulo(n,m)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>n,m</term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
             <literal>modulo</literal> computa <literal>i= n (modulo m)</literal>
-            i.e. resto da divisão de <literal>m</literal> (<literal>n</literal> e
+            i.e. resto da divisão de <literal>m</literal> (<literal>n</literal> e
             <literal>m</literal> inteiros).
         </para>
         <para>i = n - m .* int (n ./ m). Aqui, a resposta pode ser negativa se
-            <literal>n</literal> ou <literal>m</literal> são negativos.
+            <literal>n</literal> ou <literal>m</literal> são negativos.
         </para>
         <para>
             <literal>pmodulo</literal> computa <literal>i = n - |m| .* floor (n ./
                 |m|)
             </literal>
-            ,a resposta é positiva ou zero.
+            ,a resposta é positiva ou zero.
         </para>
     </refsection>
     <refsection>
index 9291dc4..fa00a72 100644 (file)
             <literal> [] * A = A * [] = [] </literal>
         </para>
         <para>
-            <literal> [] + A = A + [] = []</literal>
+            <literal> [] + A = A + [] = [] </literal>
         </para>
         <para>
-            <literal>[ [], A] = [A, []] = A </literal>
-            <literal> inv([]) =[] </literal>
+            <literal> [ [], A] = [A, []] = A </literal>
         </para>
         <para>
-            <literal> det([])=cond([])=rcond([])=1, rank([])=0</literal>
+            <literal> inv([]) = [] </literal>
+        </para>
+        <para>
+            <literal> det([]) = cond([]) = rcond([]) = 1</literal>
+        </para>
+        <para>
+            <literal> rank([]) = 0 </literal>
         </para>
         <para>
             Матричные функции возвращают <literal>[]</literal> или сообщение об
index 60c2df2..74e1d03 100644 (file)
@@ -129,25 +129,21 @@ linspace([1:4]', [5:8]', 10)   // со столбцами на входе
     []
 
 --> linspace(1, 2, 10)    // x2 > x1 : значения увеличиваются
-
  ans  =
    1.   1.111   1.222   1.333   1.444   1.556   1.667   1.778   1.889   2.
 
 
---> linspace(2, 1, 10)    // x2 < x1 : значения уменьшаются
-
+--> linspace(2, 1, 10)    // x2 &lt; x1 : значения уменьшаются
  ans  =
    2.   1.889   1.778   1.667   1.556   1.444   1.333   1.222   1.111   1.
 
 
 --> linspace(1+%i, 2-2*%i, 5)      // с комплексными числами
-
  ans  =
    1. +i     1.25 +0.25i   1.5 -0.5i   1.75 -1.25i   2. -2.i
 
 
 --> linspace([1:4]', [5:8]', 10)   // со столбцами на входе
-
  ans  =
    1.   1.444   1.889   2.333   2.778   3.222   3.667   4.111   4.556   5.
    2.   2.444   2.889   3.333   3.778   4.222   4.667   5.111   5.556   6.
index 9401548..e6283ca 100644 (file)
@@ -26,6 +26,7 @@
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>i = modulo(n,m)</synopsis>
+        <para></para>
         <synopsis>i = pmodulo(n,m)</synopsis>
     </refsynopsisdiv>
     <refsection>
index 680de12..461e86e 100644 (file)
@@ -67,7 +67,7 @@ printf("%s\n", deftxt);
 --> printf("%s\n", deftxt);
 function [f,e] = log2(x)
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs &lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end
index 0490bd4..b5d40d4 100644 (file)
@@ -79,7 +79,7 @@ printf("%s\n", txt);
 function [f,e] = log2(x)
   // x may be positive, negative, or complex
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end;
index 0861982..89843b2 100644 (file)
@@ -68,7 +68,7 @@ printf("%s\n", deftxt);
 --> printf("%s\n", deftxt);
 function [f,e] = log2(x)
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end
index 787da29..3777a30 100644 (file)
@@ -65,7 +65,7 @@ printf("%s\n", deftxt);
 --> printf("%s\n", deftxt);
 function [f,e] = log2(x)
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end
index 185a37d..fa96835 100644 (file)
@@ -79,7 +79,7 @@ printf("%s\n", txt);
 function [f,e] = log2(x)
   // x may be positive, negative, or complex
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end;
index 270fa06..a33ead7 100644 (file)
@@ -68,7 +68,7 @@ printf("%s\n", deftxt);
 --> printf("%s\n", deftxt);
 function [f,e] = log2(x)
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end
index 9d8fa40..3ff4a15 100644 (file)
@@ -77,7 +77,7 @@ printf("%s\n", txt);
 function [f,e] = log2(x)
   // x may be positive, negative, or complex
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end;
index b4dacf6..1ac6770 100644 (file)
@@ -67,7 +67,7 @@ printf("%s\n", deftxt);
 --> printf("%s\n", deftxt);
 function [f,e] = log2(x)
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end
index e76ac38..7212ee5 100644 (file)
@@ -83,7 +83,7 @@ printf("%s\n", txt);
 function [f,e] = log2(x)
   // x may be positive, negative, or complex
   [lhs,rhs] = argn(0)
-  if rhs<>1 then
+  if rhs&lt;>1 then
     msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
     error(msprintf(msg, "log2", 1))
   end;
index 7629dd1..0a1a85e 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>a=newaxes()</synopsis>
-        <synopsis>a=newaxes(h)</synopsis>
+        <synopsis>
+            a = newaxes()
+            a = newaxes(h)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
             <varlistentry>
                 <term>h</term>
                 <listitem>
-                    <para>a handle, the handle of the parent of the newly created Axes entity (optional).</para>
+                  <para>
+                    Optional handle of the graphic parent of the new axes,
+                    of type <literal>Figure</literal> or
+                    <literal>Uicontrol</literal> of style <literal>Frame</literal>.
+                    By default, the current figure is used.
+                  </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>a</term>
                 <listitem>
-                    <para>a handle, the handle on the newly created Axes entity</para>
+                    <para>Handle on the newly created Axes entity</para>
                 </listitem>
             </varlistentry>
         </variablelist>
         <title>Description</title>
         <para>
             <literal>newaxes()</literal> is used to create a new <literal>Axes</literal> entity (see
-            <link linkend="graphics_entities">graphics_entities</link>) in the current figure by default. The properties of
-            this entity are inherited from the <literal>default_axes</literal> entity (see
-            <link linkend="gda">gda</link>)
+            <link linkend="graphics_entities">graphics_entities</link>) in the current figure or in
+            the given figure or uicontrol frame.
         </para>
         <para>
-            <literal>newaxes(h)</literal> creates the axes in the frame <link linkend="uicontrol">uicontrol</link> or figure whose handle is <literal>h</literal>.
+            The properties of this entity are inherited from the <literal>default_axes</literal>
+            entity (see <link linkend="gda">gda</link>)
+        </para>
+        <para>
+            <literal>newaxes(h)</literal> creates the axes in the frame
+            <link linkend="uicontrol">uicontrol</link> or figure whose handle is <literal>h</literal>.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 clf()
-a1=newaxes();
-a1.axes_bounds=[0,0,1.0,0.5];
-t=0:0.1:20;
+a1 = newaxes();
+a1.axes_bounds = [0,0,1.0,0.5];
+t = 0:0.1:20;
 plot(t,acosh(t),'r')
-a2=newaxes();
-a2.axes_bounds=[0,0.5,1.0,0.5];
-x=0:0.1:4;
+a2 = newaxes();
+a2.axes_bounds = [0,0.5,1.0,0.5];
+x = 0:0.1:4;
 plot(x,sinh(x))
 legend('sinh')
 
 sca(a1); //make first axes current
-plot(t,asinh(t),'g')
+plot(t, asinh(t), 'g')
 legend(['acosh','asinh'])
  ]]></programlisting>
         <para>
@@ -113,6 +124,9 @@ title(a_bt, "the exponential");
                 <link linkend="subplot">subplot</link>
             </member>
             <member>
+                <link linkend="xsetech">xsetech</link>
+            </member>
+            <member>
                 <link linkend="gda">gda</link>
             </member>
             <member>
@@ -120,4 +134,14 @@ title(a_bt, "the exponential");
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revdescription>newaxes(h) can target a uicontrol frame or a given figure.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index fa545dc..b1469ae 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>ibutton &lt;=32</term>
+                <term>ibutton &lt;= -32</term>
                 <listitem>
                     <para>
                         key with ASCII code <literal>-ibutton</literal> has been
index 3ddc444..a1d4c68 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>ibutton &lt;=32</term>
+                <term>ibutton &lt;= -32</term>
                 <listitem>
                     <para>
                         La touche de code ASCII <literal>-ibutton</literal> a été
index 035c2d5..1d89cae 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>xset("font",fontid,fontsize) : choisit la police courante et sa
-                    taille.
-                </term>
+                <term>xset("font",fontid,fontsize)</term>
                 <listitem>
                     <para>
-                        Noter que <literal>fontsize</literal> s'applique aussi à  
+                        Choisit la police courante et sa taille.
+                        Noter que <literal>fontsize</literal> s'applique aussi à
                         toutes les polices autres que <literal>fontid</literal> .
                     </para>
                 </listitem>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>xset("hidden3d",colorid) : Choisit la couleur des parties
-                    arrières dans la fonction plot3d.
-                </term>
+                <term>xset("hidden3d",colorid)</term>
                 <listitem>
                     <para>
+                        Choisit la couleur des parties arrières dans la fonction plot3d.
                         <literal>colorid=0</literal> supprime l'affichage des parties
                         arrières des objets 3D. Il s'agit d'une technique dénommée 'culling'
                         et permet d'accélérer le rendu des surfaces fermées.
index 5be4502..0f524f0 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="newaxes">
+<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="newaxes">
 
     <refnamediv>
 
 
         <title>呼び出し手順</title>
 
-        <synopsis>a=newaxes()</synopsis>
+        <synopsis>
+            a = newaxes()
+            a = newaxes(h)
+        </synopsis>
 
     </refsynopsisdiv>
 
         <title>引数</title>
 
         <variablelist>
+            <varlistentry>
+                <term>h</term>
+                <listitem>
+                  <para>
+                    Optional handle of the graphic parent of the new axes,
+                    of type <literal>Figure</literal> or
+                    <literal>Uicontrol</literal> of style <literal>Frame</literal>.
+                    By default, the current figure is used.
+                  </para>
+                </listitem>
+            </varlistentry>
 
             <varlistentry>
 
         <title>例</title>
 
         <programlisting role="example"><![CDATA[
-
 clf()
-
-a1=newaxes();
-
-a1.axes_bounds=[0,0,1.0,0.5];
-
-t=0:0.1:20;
-
+a1 = newaxes();
+a1.axes_bounds = [0,0,1.0,0.5];
+t = 0:0.1:20;
 plot(t,acosh(t),'r')
-
-a2=newaxes();
-
-a2.axes_bounds=[0,0.5,1.0,0.5];
-
-x=0:0.1:4;
-
+a2 = newaxes();
+a2.axes_bounds = [0,0.5,1.0,0.5];
+x = 0:0.1:4;
 plot(x,sinh(x))
-
 legend('sinh')
 
-
-
 sca(a1); //最初の軸をカレントとする
-
 plot(t,asinh(t),'g')
-
 legend(['acosh','asinh'])
-
  ]]></programlisting>
-
+        <para>
+            The following example uses <literal>newaxes(h)</literal>
+        </para>
+        <programlisting role="example"><![CDATA[
+// Create a new figure
+f = figure("layout", "gridbag", ...
+    "toolbar", "none", ...
+    "menubar", "none", ...
+    "backgroundcolor", [1 1 1]);
+
+// Create the frames where each graph is put
+c = createConstraints("gridbag", [1 1 1 1], [1 1], "both");
+top_left = uicontrol(f, "style", "frame","constraints", c);
+
+c.grid = [2 1 1 1];
+top_right = uicontrol(f, "style", "frame", "constraints", c);
+
+c.grid = [1 2 2 2];
+bottom = uicontrol(f, "style", "frame", "constraints", c);
+
+// Create the axes in each frame
+a_tl = newaxes(top_left);
+a_tr = newaxes(top_right);
+a_bt = newaxes(bottom);
+
+// Plot in the frames
+X = (1:100) ./ 50;
+plot(a_tl, X, X, "r");
+plot(a_tr, X, cos(2 * %pi * 3 * X), "g");
+plot(a_bt, X, exp(X), "b");
+
+title(a_tl, "a line");
+title(a_tr, "a cosine");
+title(a_bt, "the exponential");
+    ]]></programlisting>
     </refsection>
 
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="subplot">subplot</link>
-
             </member>
-
             <member>
-
+                <link linkend="xsetech">xsetech</link>
+            </member>
+            <member>
                 <link linkend="gda">gda</link>
-
             </member>
-
             <member>
-
                 <link linkend="sca">sca</link>
-
             </member>
-
         </simplelist>
-
+    </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revdescription>
+                    newaxes(h) can target a uicontrol frame or a given figure.
+                </revdescription>
+            </revision>
+        </revhistory>
     </refsection>
 
 </refentry>
index 20a6dbc..5bf9042 100644 (file)
 
             <varlistentry>
 
-                <term>ibutton &lt;=32</term>
+                <term>ibutton &lt;= -32</term>
 
                 <listitem>
 
index f9c5f77..1337f2e 100644 (file)
 
             <varlistentry>
 
-                <term>xset("font",fontid,fontsize) : Set the current font and its current</term>
-
+                <term>xset("font",fontid,fontsize)</term>
                 <listitem>
-
                     <para>
-
-                        size. Note that <literal>fontsize</literal> applies to all fonts not
-
+                        Set the current font and its current size.
+                        Note that <literal>fontsize</literal> applies to all fonts not
                         only <literal>fontid</literal> .
-
                     </para>
 
                 </listitem>
 
             <varlistentry>
 
-                <term>xset("hidden3d",colorid) : Set the color number for backward facing faces in</term>
-
+                <term>xset("hidden3d",colorid)</term>
                 <listitem>
-
                     <para>
-
+                        Set the color number for backward facing faces in
                         <literal>plot3d</literal>. <literal>colorid=0</literal> zero suppress the
-
                         drawing of backward facing faces of 3d objects. This is technically
-
                         called 'culling' and speeds up the rendering of closed surfaces.
-
                     </para>
-
                 </listitem>
 
             </varlistentry>
                     </para>
 
                     <programlisting role=""><![CDATA[
-
 xdel();
-
 xset("wresize",1);
-
 plot2d();
-
 xset("wdim",1000,500)
-
  ]]></programlisting>
 
                     <para>If flag=0 the scale of the graphic is left unchanged when the
@@ -625,15 +610,10 @@ xset("wdim",1000,500)
                     </para>
 
                     <programlisting role=""><![CDATA[
-
 xdel();
-
 plot2d();
-
 xset("wresize",0);
-
 xset("wdim",1000,500)
-
  ]]></programlisting>
 
                 </listitem>
index 1e5a1f6..5d4b919 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="newaxes" 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="newaxes" xml:lang="pt">
     <refnamediv>
         <refname>newaxes</refname>
         <refpurpose>Cria uma nova entidade Axes (de eixos)</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>a=newaxes()</synopsis>
+        <title>Seqüência de Chamamento</title>
+        <synopsis>
+            a = newaxes()
+            a = newaxes(h)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
+                <term>h</term>
+                <listitem>
+                  <para>
+                    Optional handle of the graphic parent of the new axes,
+                    of type <literal>Figure</literal> or
+                    <literal>Uicontrol</literal> of style <literal>Frame</literal>.
+                    By default, the current figure is used.
+                  </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>a</term>
                 <listitem>
                     <para>o manipulador para a nova entidade Axes criada</para>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            <literal>newaxes()</literal> é usado para criar uma nova entidade
+            <literal>newaxes()</literal> é usado para criar uma nova entidade
             <literal>Axes</literal> (ver <link linkend="graphics_entities">graphics_entities</link>) na figura corrente.
-            As propriedades dessa entidade são herdadas da entidade
+            As propriedades dessa entidade são herdadas da entidade
             <literal>default_axes</literal> (ver <link linkend="gda">gda</link>)
         </para>
     </refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
 clf()
-a1=newaxes();
-a1.axes_bounds=[0,0,1.0,0.5];
-t=0:0.1:20;
+a1 = newaxes();
+a1.axes_bounds = [0,0,1.0,0.5];
+t = 0:0.1:20;
 plot(t,acosh(t),'r')
-a2=newaxes();
-a2.axes_bounds=[0,0.5,1.0,0.5];
-x=0:0.1:4;
+a2 = newaxes();
+a2.axes_bounds = [0,0.5,1.0,0.5];
+x = 0:0.1:4;
 plot(x,sinh(x))
 legend('sinh')
 
@@ -60,14 +77,52 @@ sca(a1); //tornando os primeiros eixos os eixos correntes
 plot(t,asinh(t),'g')
 legend(['acosh','asinh'])
  ]]></programlisting>
+        <para>
+            The following example uses <literal>newaxes(h)</literal>
+        </para>
+        <programlisting role="example"><![CDATA[
+// Create a new figure
+f = figure("layout", "gridbag", ...
+    "toolbar", "none", ...
+    "menubar", "none", ...
+    "backgroundcolor", [1 1 1]);
+
+// Create the frames where each graph is put
+c = createConstraints("gridbag", [1 1 1 1], [1 1], "both");
+top_left = uicontrol(f, "style", "frame","constraints", c);
+
+c.grid = [2 1 1 1];
+top_right = uicontrol(f, "style", "frame", "constraints", c);
+
+c.grid = [1 2 2 2];
+bottom = uicontrol(f, "style", "frame", "constraints", c);
+
+// Create the axes in each frame
+a_tl = newaxes(top_left);
+a_tr = newaxes(top_right);
+a_bt = newaxes(bottom);
+
+// Plot in the frames
+X = (1:100) ./ 50;
+plot(a_tl, X, X, "r");
+plot(a_tr, X, cos(2 * %pi * 3 * X), "g");
+plot(a_bt, X, exp(X), "b");
+
+title(a_tl, "a line");
+title(a_tr, "a cosine");
+title(a_bt, "the exponential");
+    ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="subplot">subplot</link>
             </member>
             <member>
+                <link linkend="xsetech">xsetech</link>
+            </member>
+            <member>
                 <link linkend="gda">gda</link>
             </member>
             <member>
@@ -75,4 +130,14 @@ legend(['acosh','asinh'])
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revdescription>newaxes(h) can target a uicontrol frame or a given figure.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 13cbd4b..2d73ad5 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>ibutton &lt;=-32</term>
+                <term>ibutton &lt;= -32</term>
                 <listitem>
                     <para>
                         uma tecla com código ASCII <literal>-ibutton</literal> foi
index 41c6bbc..43b8613 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="xset" xml:lang="pt">
     <refnamediv>
         <refname>xset</refname>
-        <refpurpose>ajusta valores para o contexto gráfico. Função
+        <refpurpose>ajusta valores para o contexto gráfico. Função
             obsoleta
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>xset(choice-name,x1,x2,x3,x4,x5)
             xset()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>choice-name</term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>Aviso: está função está obsoleta. Utilize a representação de objetos
-            do Scilab ao invés (ver as documentações das funções <link linkend="set">set</link> e <link linkend="get">get</link> bem como a
-            página <link linkend="graphics_entities">graphics_entities</link>).
+        <title>Descrição</title>
+        <para>Aviso: está função está obsoleta. Utilize a representação de objetos
+            do Scilab ao invés (ver as documentações das funções <link linkend="set">set</link> e <link linkend="get">get</link> bem como a
+            página <link linkend="graphics_entities">graphics_entities</link>).
         </para>
         <para>
-            <literal>xset</literal> é utilizado para ajustar valores padrões do
-            contexto da janela de gráficos corrente.
+            <literal>xset</literal> é utilizado para ajustar valores padrões do
+            contexto da janela de gráficos corrente.
         </para>
-        <para>Quando chamado sem argumento, um menu de escolha é criado exibindo
-            os valores correntes e mudanças podem ser realizadas através e botões de
+        <para>Quando chamado sem argumento, um menu de escolha é criado exibindo
+            os valores correntes e mudanças podem ser realizadas através e botões de
             escolha.
         </para>
         <para>
@@ -68,9 +68,9 @@
             <varlistentry>
                 <term>xset("alufunction",number)</term>
                 <listitem>
-                    <para>usado para ajustar a função lógica para desenho. A função
-                        lógica utilizada é ajustada por <literal>x1</literal>. Os valores
-                        usuais são: 3 para cópia (padrão), 6 para animação e 0 para limpeza.
+                    <para>usado para ajustar a função lógica para desenho. A função
+                        lógica utilizada é ajustada por <literal>x1</literal>. Os valores
+                        usuais são: 3 para cópia (padrão), 6 para animação e 0 para limpeza.
                         Ver alufunctions para mais detalhes.
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xset("auto clear","on"|"off")</term>
                 <listitem>
-                    <para>alterna o modo de limpeza automática para gráficos entre "on"
-                        e "off" . Quando o modo de limpeza automática é "on", esboços
-                        sucessivos não são superpostos, ie, uma operação
-                        <literal>clf()</literal> (a janela de gráficos é limpa e os
-                        gráficos gravados associados são apagados) é realizada antes de cada
-                        função gráfica de alto-nível. O valor padrão é "off".
+                    <para>alterna o modo de limpeza automática para gráficos entre "on"
+                        e "off" . Quando o modo de limpeza automática é "on", esboços
+                        sucessivos não são superpostos, ie, uma operação
+                        <literal>clf()</literal> (a janela de gráficos é limpa e os
+                        gráficos gravados associados são apagados) é realizada antes de cada
+                        função gráfica de alto-nível. O valor padrão é "off".
                     </para>
                 </listitem>
             </varlistentry>
@@ -91,7 +91,7 @@
                 <term>xset("background",color)</term>
                 <listitem>
                     <para>ajusta a cor de plano de fundo do objeto Axes corrente. O
-                        argumento <literal>color</literal> é um índice no mapa de cores da
+                        argumento <literal>color</literal> é um índice no mapa de cores da
                         cor a ser utilizada.
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xset("clipping",x,y,w,h)</term>
                 <listitem>
-                    <para>ajusta a zona de recorte (a zona da janela de gráficos onde os
-                        esboços podem ser desenhados) como sendo o retângulo (x,y,w,h)
-                        (ponto superior esquerdo, largura, altura). Esta função utiliza a
-                        utiliza as coordenadas correntes do esboço.
+                    <para>ajusta a zona de recorte (a zona da janela de gráficos onde os
+                        esboços podem ser desenhados) como sendo o retângulo (x,y,w,h)
+                        (ponto superior esquerdo, largura, altura). Esta função utiliza a
+                        utiliza as coordenadas correntes do esboço.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("color",value)</term>
                 <listitem>
-                    <para>ajusta a cor padrão para funções de preechimento, linha ou
-                        impressão de textos. <literal>value</literal> é um inteiro projetado
-                        no intervalo [0,whiteid]. 0 é usado para preenchimento com preto e
+                    <para>ajusta a cor padrão para funções de preechimento, linha ou
+                        impressão de textos. <literal>value</literal> é um inteiro projetado
+                        no intervalo [0,whiteid]. 0 é usado para preenchimento com preto e
                         whiteid para preenchimento com branco. O valor do identificador do
-                        branco pode ser obtido através de
+                        branco pode ser obtido através de
                         <literal>xget("white")</literal>.
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xset("colormap",cmap)</term>
                 <listitem>
-                    <para>ajusta o mapa de cores como sendo uma matriz m x 3. m é o
-                        número de cores. A cor de número i é dada como sendo a tripla
-                        cmap(i,1), cmap(i,2), cmap(i,3) correspondentes respectivamente às
+                    <para>ajusta o mapa de cores como sendo uma matriz m x 3. m é o
+                        número de cores. A cor de número i é dada como sendo a tripla
+                        cmap(i,1), cmap(i,2), cmap(i,3) correspondentes respectivamente às
                         intensidades de vermelho, verde e azul entre 0 e 1.
                     </para>
                 </listitem>
                             color",0)
                         </literal>
                         ), ajusta o estilo de tracejado como o estilo i
-                        (0 para linha sólida). No modo colorido (<literal>xset("use color",1
+                        (0 para linha sólida). No modo colorido (<literal>xset("use color",1
                             )
                         </literal>
-                        )é utilizado para ajustar a cor da linha, da marca e do
-                        texto. Esta palavra-chave está obsoleta, utilize
+                        )é utilizado para ajustar a cor da linha, da marca e do
+                        texto. Esta palavra-chave está obsoleta, utilize
                         <literal>xset('color',i)</literal> ou <literal>xset('line
                             style',i)
                         </literal>
-                        ao invés.
+                        ao invés.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("default")</term>
                 <listitem>
-                    <para>reajusta o contexto gráfico para valores padrões.</para>
+                    <para>reajusta o contexto gráfico para valores padrões.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>xset("font",fontid,fontsize) :</term>
+                <term>xset("font",fontid,fontsize)</term>
                 <listitem>
                     <para>ajusta a fonte corrente e seu tamanho. Note que
-                        <literal>fontsize</literal> se aplica a todas as fontes, não só a
+                        <literal>fontsize</literal> se aplica a todas as fontes, não só a
                         <literal>fontid</literal> .
                     </para>
                 </listitem>
                 <term>xset("foreground",color)</term>
                 <listitem>
                     <para>ajusta a cor de primeiro plano do objeto Axes corrente. O
-                        argumento <literal>color</literal> é um índice no mapa de cores da
+                        argumento <literal>color</literal> é um índice no mapa de cores da
                         cor a ser utilizada.
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xset("fpf",string)</term>
                 <listitem>
-                    <para>ajusta o formato de exibição de ponto flutuante para funções
-                        de contorno. <literal>string</literal> é um string fornecendo o
+                    <para>ajusta o formato de exibição de ponto flutuante para funções
+                        de contorno. <literal>string</literal> é um string fornecendo o
                         formato em sintaxe C (por exemplo <literal>string="%.3f"</literal>).
                         Use <literal>string=""</literal> para retornar ao formato
-                        padrão.
+                        padrão.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>xset("hidden3d",colorid) :</term>
+                <term>xset("hidden3d",colorid)</term>
                 <listitem>
-                    <para>ajusta o número de cor para as faces escondidas em um
+                    <para>ajusta o número de cor para as faces escondidas em um
                         <literal>plot3d. colorid=0</literal> suprime o desenho de faces
-                        escondidas de objetos 3d. Isto é tecnicamente chamdo 'culling' e
-                        acelera a renderização de superfícies fechadas.
+                        escondidas de objetos 3d. Isto é tecnicamente chamdo 'culling' e
+                        acelera a renderização de superfícies fechadas.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("line mode",type)</term>
                 <listitem>
-                    <para>esta função é utilizada para se ajustar o modo de desenho da
-                        linha. O modo absoluto é ajustado com type= 1 e o modo relativo com
+                    <para>esta função é utilizada para se ajustar o modo de desenho da
+                        linha. O modo absoluto é ajustado com type= 1 e o modo relativo com
                         type=0. (aviso: o modo type= 0 possui defeitos)
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xset("line style",value)</term>
                 <listitem>
-                    <para>ajusta o estilo de linha corrente (1: sólida, &gt;1 estilos
+                    <para>ajusta o estilo de linha corrente (1: sólida, &gt;1 estilos
                         tracejados).
                     </para>
                 </listitem>
                 <listitem>
                     <para>ajusta a marca corrente e seu tamanho. Use
                         <literal>xset()</literal> para visualizar as marcas. Note que
-                        <literal>marksize</literal> se aplica a todas as marcas, não apenas
+                        <literal>marksize</literal> se aplica a todas as marcas, não apenas
                         a <literal>markid</literal> .
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xset("pattern",value)</term>
                 <listitem>
-                    <para>ajusta o padrão (pattern, não confundir com padrão = default)
-                        corrente para funções de preenchimento. O valor é um inteiro
-                        projetado no intervalo [0,whiteid]. 0 é utilizado para preenchimento
+                    <para>ajusta o padrão (pattern, não confundir com padrão = default)
+                        corrente para funções de preenchimento. O valor é um inteiro
+                        projetado no intervalo [0,whiteid]. 0 é utilizado para preenchimento
                         com preto e whiteid para preenchimento com branco. O valor de
                         whiteid pode ser obtido com <literal>xget("white")</literal>.
-                        "pattern" é equivalente a "color".
+                        "pattern" é equivalente a "color".
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("thickness",value)</term>
                 <listitem>
-                    <para>ajusta o valor de espessura das linhas em pixel (0 e 1 têm o
+                    <para>ajusta o valor de espessura das linhas em pixel (0 e 1 têm o
                         mesmo significado: 1 pixel de espessura).
                     </para>
                 </listitem>
                 <term>xset("use color",flag)</term>
                 <listitem>
                     <para>
-                        se flag=1, então <literal>xset("pattern",.)</literal> ou
-                        <literal>xset("dashes",.)</literal> será utilizado de modo a
-                        modificar a cor padrão para desenho ou para padrões de
-                        preenchimento. Se flag=0 então retorna-se ao modo de escalas de
+                        se flag=1, então <literal>xset("pattern",.)</literal> ou
+                        <literal>xset("dashes",.)</literal> será utilizado de modo a
+                        modificar a cor padrão para desenho ou para padrões de
+                        preenchimento. Se flag=0 então retorna-se ao modo de escalas de
                         cinza e tracejados.
                     </para>
                 </listitem>
             <varlistentry>
                 <term>xset("viewport",x,y)</term>
                 <listitem>
-                    <para>ajusta a posição do cursor.</para>
+                    <para>ajusta a posição do cursor.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("wdim",width,height)</term>
                 <listitem>
-                    <para>ajusta a largura e altura da janela de gráficos corrente. Esta
-                        opção não é utilizada pelo driver Postscript.
+                    <para>ajusta a largura e altura da janela de gráficos corrente. Esta
+                        opção não é utilizada pelo driver Postscript.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("wpdim",width,height)</term>
                 <listitem>
-                    <para>ajusta a largura e altura da janela de gráficos física
+                    <para>ajusta a largura e altura da janela de gráficos física
                         corrente (que pode ser diferente do tamanho atual no modo wresize
-                        1). Esta opção não é utilizada pelo driver Postscript.
+                        1). Esta opção não é utilizada pelo driver Postscript.
                     </para>
                 </listitem>
             </varlistentry>
                 <listitem>
                     <para>
                         ajusta a janela <literal>window-number</literal> como sendo a
-                        janela corrente e cria a janela se esta não existir.
+                        janela corrente e cria a janela se esta não existir.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("wpos",[x,y])</term>
                 <listitem>
-                    <para>ajusta a posição do ponto superior esquerdo da janela de
-                        gráficos.
+                    <para>ajusta a posição do ponto superior esquerdo da janela de
+                        gráficos.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>xset("wresize",flag)</term>
                 <listitem>
-                    <para>se flag= 1então o gráfico é automaticamente redimensionado
-                        para preencher a janela de gráficos.
+                    <para>se flag= 1então o gráfico é automaticamente redimensionado
+                        para preencher a janela de gráficos.
                     </para>
                     <programlisting role=""><![CDATA[
 xdel();
@@ -316,9 +316,9 @@ xset("wresize",1);
 plot2d();
 xset("wdim",1000,500)
  ]]></programlisting>
-                    <para>Se flag=0 a escala do gráfico é inalterada quando a janela de
-                        gráfico é redimensionada. O cursor no canto superior esquerdo ou as
-                        setas do teclado podem ser utilizadas para rolar o gráfico .
+                    <para>Se flag=0 a escala do gráfico é inalterada quando a janela de
+                        gráfico é redimensionada. O cursor no canto superior esquerdo ou as
+                        setas do teclado podem ser utilizadas para rolar o gráfico .
                     </para>
                     <programlisting role=""><![CDATA[
 xdel();
@@ -331,7 +331,7 @@ xset("wdim",1000,500)
         </variablelist>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="xget">xget</link>
index c059a66..a49301e 100644 (file)
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example">if (getscilabmode() == "STD") then
-            addmenu('foo');
-            foo = 'disp(''hello'')';
+        <programlisting role="example">
+if (getscilabmode() == "STD") then
+    addmenu('foo');
+    foo = 'disp(''hello'')';
 
-            addmenu('Hello',['Franck';'Peter'])
-            Hello = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
+    addmenu('Hello',['Franck';'Peter'])
+    Hello = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
 
-            addmenu('Bye',list(0,'French_Bye'));
-            French_Bye = 'disp(''Au revoir'')';
-            else
-            mprintf('This example requires to use scilab with GUI mode.\n');
-            end
+    addmenu('Bye',list(0,'French_Bye'));
+    French_Bye = 'disp(''Au revoir'')';
+    else
+    mprintf('This example requires to use scilab with GUI mode.\n');
+    end
 
-            addmenu(0,'Hello',['Franck';'Peter']);
-            Hello_0 = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
-
-            //C defined Callback
-            // creating Callback code
-            code=[ '#include ""machine.h""'
-            '#include ""sciprint.h""'
-            'void foo(char *name, int *win, int *entry)'
-            '{'
-            '  if (*win==-1) '
-            '    sciprint(""menu %s(%i) in Scilab window selected.\n"", name, *entry+1);'
-            '  else'
-            '    sciprint(""menu %s(%i) in window %i selected.\n"", name, *entry+1, *win);'
-            '}'];
-            //creating foo.c file
-            current_dir = pwd();
-            chdir(TMPDIR);
-            mputl(code, TMPDIR+'/foo.c');
-            //creating Makefile
-            ilib_for_link('foo','foo.c',[],'c');
-            exec('loader.sce');
-            chdir(current_dir);
-            //add menu
-            addmenu(0,'foo',['a','b','c'],list(1,'foo'));
+    addmenu(0,'Hello',['Franck';'Peter']);
+    Hello_0 = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
 
+    //C defined Callback
+    // creating Callback code
+    code=[ '#include ""machine.h""'
+    '#include ""sciprint.h""'
+    'void foo(char *name, int *win, int *entry)'
+    '{'
+    '  if (*win==-1) '
+    '    sciprint(""menu %s(%i) in Scilab window selected.\n"", name, *entry+1);'
+    '  else'
+    '    sciprint(""menu %s(%i) in window %i selected.\n"", name, *entry+1, *win);'
+    '}'];
+    //creating foo.c file
+    current_dir = pwd();
+    chdir(TMPDIR);
+    mputl(code, TMPDIR+'/foo.c');
+    //creating Makefile
+    ilib_for_link('foo','foo.c',[],'c');
+    exec('loader.sce');
+    chdir(current_dir);
+    //add menu
+    addmenu(0,'foo',['a','b','c'],list(1,'foo'));
+end
         </programlisting>
     </refsection>
     <refsection role="see also">
index ccf5b6b..63a22e3 100644 (file)
@@ -29,7 +29,7 @@
                 <term>nsub</term>
                 <listitem>
                     <para>
-                        integer. The number of submenu to de-activate (if any). If button has no sub-menu, <literal>nsub</literal> is ignored
+                        integer. The number of submenu to activate (if any). If button has no sub-menu, <literal>nsub</literal> is ignored
                     </para>
                 </listitem>
             </varlistentry>
index c83ab6c..956d8bf 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>delTree = uiDeleteNode(tree, node)</synopsis>
-        <synopsis>delTree = uiDeleteNode(tree, position)</synopsis>
+        <synopsis>
+            delTree = uiDeleteNode(tree, node)
+            delTree = uiDeleteNode(tree, position)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Input parameters</title>
index 27c9360..bdd04ed 100644 (file)
@@ -6,9 +6,11 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>nodeList = uiFindNode(tree, node)</synopsis>
-        <synopsis>nodeList = uiFindNode(tree, position)</synopsis>
-        <synopsis>nodeList = uiFindNode(tree, property, value)</synopsis>
+        <synopsis>
+            nodeList = uiFindNode(tree, node)
+            nodeList = uiFindNode(tree, position)
+            nodeList = uiFindNode(tree, property, value)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Input parameters</title>
index 67117b9..7052260 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>children = uiGetChildrenNode(tree, node)</synopsis>
-        <synopsis>children = uiGetChildrenNode(tree, position)</synopsis>
+        <synopsis>
+            children = uiGetChildrenNode(tree, node)
+            children = uiGetChildrenNode(tree, position)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Input parameters</title>
index ab71372..e7745fa 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>parent = uiGetParentNode(tree, node)</synopsis>
-        <synopsis>parent = uiGetParentNode(tree, position)</synopsis>
+        <synopsis>
+            parent = uiGetParentNode(tree, node)
+            parent = uiGetParentNode(tree, position)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Input parameters</title>
index ba0f902..9271fab 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>insertTree = uiInsertNode(tree, position, node)</synopsis>
-        <synopsis>insertTree = uiInsertNode(tree, parentNode, node)</synopsis>
+        <synopsis>
+            insertTree = uiInsertNode(tree, position, node)
+            insertTree = uiInsertNode(tree, parentNode, node)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Input parameters</title>
index fee325b..64bf8da 100644 (file)
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example">if (getscilabmode() == "STD") then
-            addmenu('foo');
-            foo = 'disp(''hello'')';
-            addmenu('Hello',['Franck';'Peter'])
-            Hello = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
-            addmenu('Bye',list(0,'French_Bye'));
-            French_Bye = 'disp(''Au revoir'')';
-            else
-            mprintf('This example requires to use scilab with GUI mode.\n');
-            end
-            addmenu(0,'Hello',['Franck';'Peter']);
-            Hello_0 = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
-            //Cで定義したコールバック
-            // コールバックコードを作成
-            code=[ '#include ""machine.h""'
-            '#include ""sciprint.h""'
-            'void foo(char *name, int *win, int *entry)'
-            '{'
-            '  if (*win==-1) '
-            '    sciprint(""menu %s(%i) in Scilab window selected.\n"", name, *entry+1);'
-            '  else'
-            '    sciprint(""menu %s(%i) in window %i selected.\n"", name, *entry+1, *win);'
-            '}'];
-            // foo.cファイルを作成
-            current_dir = pwd();
-            chdir(TMPDIR);
-            mputl(code, TMPDIR+'/foo.c');
-            // Makefileを作成
-            ilib_for_link('foo','foo.c',[],'c');
-            exec('loader.sce');
-            chdir(current_dir);
-            // メニューを追加
-            addmenu(0,'foo',['a','b','c'],list(1,'foo'));
+        <programlisting role="example">
+if (getscilabmode() == "STD") then
+    addmenu('foo');
+    foo = 'disp(''hello'')';
+    addmenu('Hello',['Franck';'Peter'])
+    Hello = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
+    addmenu('Bye',list(0,'French_Bye'));
+    French_Bye = 'disp(''Au revoir'')';
+    else
+    mprintf('This example requires to use scilab with GUI mode.\n');
+    end
+    addmenu(0,'Hello',['Franck';'Peter']);
+    Hello_0 = ['disp(''hello Franck'')';'disp(''hello Peter'')'];
+    //Cで定義したコールバック
+    // コールバックコードを作成
+    code=[ '#include ""machine.h""'
+    '#include ""sciprint.h""'
+    'void foo(char *name, int *win, int *entry)'
+    '{'
+    '  if (*win==-1) '
+    '    sciprint(""menu %s(%i) in Scilab window selected.\n"", name, *entry+1);'
+    '  else'
+    '    sciprint(""menu %s(%i) in window %i selected.\n"", name, *entry+1, *win);'
+    '}'];
+    // foo.cファイルを作成
+    current_dir = pwd();
+    chdir(TMPDIR);
+    mputl(code, TMPDIR+'/foo.c');
+    // Makefileを作成
+    ilib_for_link('foo','foo.c',[],'c');
+    exec('loader.sce');
+    chdir(current_dir);
+    // メニューを追加
+    addmenu(0,'foo',['a','b','c'],list(1,'foo'));
+end
         </programlisting>
     </refsection>
     <refsection role="see also">
index ea69ef2..9ce14a0 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>delTree = uiDeleteNode(tree, node)</synopsis>
-        <synopsis>delTree = uiDeleteNode(tree, position)</synopsis>
+        <synopsis>
+            delTree = uiDeleteNode(tree, node)
+            delTree = uiDeleteNode(tree, position)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>入力パラメータ</title>
index c5f2ad1..e2b8e49 100644 (file)
@@ -6,9 +6,11 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>nodeList = uiFindNode(tree, node)</synopsis>
-        <synopsis>nodeList = uiFindNode(tree, position)</synopsis>
-        <synopsis>nodeList = uiFindNode(tree, property, value)</synopsis>
+        <synopsis>
+            nodeList = uiFindNode(tree, node)
+            nodeList = uiFindNode(tree, position)
+            nodeList = uiFindNode(tree, property, value)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>入力パラメータ</title>
index fd0ff57..99ca691 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>children = uiGetChildrenNode(tree, node)</synopsis>
-        <synopsis>children = uiGetChildrenNode(tree, position)</synopsis>
+        <synopsis>
+            children = uiGetChildrenNode(tree, node)
+            children = uiGetChildrenNode(tree, position)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>入力パラメータ</title>
index c8e1b6a..1cf4b66 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>parent = uiGetParentNode(tree, node)</synopsis>
-        <synopsis>parent = uiGetParentNode(tree, position)</synopsis>
+        <synopsis>
+            parent = uiGetParentNode(tree, node)
+            parent = uiGetParentNode(tree, position)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>入力パラメータ</title>
index 38c2bf3..aa5a813 100644 (file)
@@ -6,8 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>insertTree = uiInsertNode(tree, position, node)</synopsis>
-        <synopsis>insertTree = uiInsertNode(tree, parentNode, node)</synopsis>
+        <synopsis>
+            insertTree = uiInsertNode(tree, position, node)
+            insertTree = uiInsertNode(tree, parentNode, node)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>入力パラメータ</title>
index 8cdc904..41f14a9 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>nb = historysize()</synopsis>
-        <synopsis>nbMax = historysize("max")</synopsis>
-        <synopsis>nbMax = historysize(newMax)</synopsis>
+        <synopsis>
+            nb = historysize()
+            nbMax = historysize("max")
+            nbMax = historysize(newMax)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index fe4a3cd..b6b22bb 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>nb = historysize()</synopsis>
-        <synopsis>nbMax = historysize("max")</synopsis>
-        <synopsis>nbMax = historysize(newMax)</synopsis>
+        <synopsis>
+            nb = historysize()
+            nbMax = historysize("max")
+            nbMax = historysize(newMax)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index f886de6..bff072e 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>load(filename [,x1,...,xn])</synopsis>
-        <synopsis>load(fd [,x1,...,xn])</synopsis>
+        <synopsis>
+            load(filename [,x1,...,xn])
+            load(fd [,x1,...,xn])
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
index 6f3a6be..3d4ac22 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>format : character string, specifies a "Fortran" format. This</term>
+                <term>format</term>
                 <listitem>
-                    <para>character string must begin with a right parenthesis and end with a left parenthesis.  Formats cannot mix floating point or character edition modes.</para>
+                    <para>character string specifying a "Fortran" format. It must begin with a right parenthesis and end with a left parenthesis.Formats cannot mix floating point or character edition modes.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index dc45c4e..dd1312e 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>load(filename [,x1,...,xn])</synopsis>
-        <synopsis>load(fd [,x1,...,xn])</synopsis>
+        <synopsis>
+            load(filename [,x1,...,xn])
+            load(fd [,x1,...,xn])
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index 3e319c1..00071a9 100644 (file)
@@ -45,9 +45,9 @@
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>format : 文字列,"Fortran" 形式で指定します. </term>
+                <term>format</term>
                 <listitem>
-                    <para>この文字列は右括弧で始まり,
+                    <para>文字列,"Fortran" 形式で指定します. この文字列は右括弧で始まり,
                         左括弧で終わる必要があります. format では
                         浮動小数点数または文字列編集モードを混用することができません.
                     </para>
index f75f983..7ea86d1 100644 (file)
 "ar",nap,iter
 "ar",nap,iter,epsg
 "ar",nap,iter,epsg,epsf
-"ar",nap,iter,epsg,epsf,epsx]]>
-                        </screen>
+"ar",nap,iter,epsg,epsf,epsx]]></screen>
                     </para>
                     <para>where:</para>
                     <variablelist>
         </para>
         <screen><![CDATA[
 min f(x)
-binf <= x <= bsup]]>
+binf &lt;= x &lt;= bsup]]>
         </screen>
         <para>
             where <literal>binf</literal> is the lower bound and
@@ -822,15 +821,13 @@ f(x) = 0, |g(x)|=0
 Norm of projected gradient lower than   0.0000000D+00.
 
  xopt  =
-
     1.
     2.
     3.
- fopt  =
 
+ fopt  =
     0.
-]]>
-        </screen>
+]]></screen>
         <para>In the following example, we solve the Rosenbrock test case. For
             each iteration of the algorithm, we plot the current value of x into a 2D
             graph containing the contours of Rosenbrock's function. This allows to see
@@ -1155,8 +1152,7 @@ mprintf("Numerical derivative:[%s]\n", strcat (string(gnd), " "));
         <screen><![CDATA[
 Exact derivative:[-638 -88]
 Numerical derivative:[-215.6 -88]
-]]>
-        </screen>
+]]></screen>
     </refsection>
     <refsection>
         <title>Example: C function</title>
@@ -1373,7 +1369,7 @@ fortransource = ['subroutine rosenf(ind,n,x,f,g,izs,rzs,dzs)'
 'cDEC$ ENDIF'
 'C     -------------------------------------------'
 'c     Example of cost function given by a subroutine'
-'c     if n<=2 returns ind=0'
+'c     if n&lt;=2 returns ind=0'
 'c     f.bonnans, oct 86'
 '      implicit double precision (a-h,o-z)'
 [etc...]
index 769f349..abcb7a9 100644 (file)
             </para>
         </para>
         <note><literal>host("cls")</literal> clears the consolebox screen</note>
+        <note>
+            When the console has the focus, pressing the <literal>F12</literal> key toggles
+            the consolebox on|off
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -123,7 +127,7 @@ mprintf("See the consolebox button appearing in the task bar.\n"+..
 sleep(10,"s")
 consolebox('toggle')
 sleep(5,"s")
-consolebox('toggle')
+// Now: press the F12 key to toggle the consolebox
 consolebox on
 consolebox()
 
@@ -147,6 +151,9 @@ unix_x("set");       // Results are displayed in a messagebox. Nothing in consol
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="console">console</link>
+            </member>
+            <member>
                 <link linkend="host">host</link>
             </member>
             <member>
index fff1eb4..537adb8 100644 (file)
             </para>
         </para>
         <note><literal>host("cls")</literal> efface le contenu de la consolebox.</note>
+        <note>
+            Lorsque la console a le focus, la touche <literal>F12</literal> permet de faire
+            apparaitre ou disparaitre la consolebox.
+        </note>
     </refsection>
     <refsection>
         <title>Exemples</title>
@@ -126,7 +130,7 @@ mprintf("\nLe bouton de la consolebox apparaît dans la barre des tâches.\n"+..
 sleep(10,"s")
 consolebox('toggle')
 sleep(5,"s")
-consolebox('toggle')
+// Maintenant : tester la touche F12 pour faire apparaitre/disparaitre la consolebox
 consolebox on
 consolebox()
 
@@ -150,6 +154,9 @@ unix_x("set");       // Une messagebox s'ouvre et affiche les résultats.
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
+                <link linkend="console">console</link>
+            </member>
+            <member>
                 <link linkend="host">host</link>
             </member>
             <member>