* Bug 16229 fixed [doc]: 'help scilab' page improved 12/21112/8
Samuel GOUGEON [Fri, 1 Nov 2019 02:13:22 +0000 (03:13 +0100)]
  http://bugzilla.scilab.org/16229

  New PDF en_US page: http://bugzilla.scilab.org/attachment.cgi?id=5017

Change-Id: I3df52bcc750b4f063334193b69486d050378ddff

scilab/CHANGES.md
scilab/modules/core/help/en_US/scilab.xml
scilab/modules/core/help/fr_FR/scilab.xml
scilab/modules/core/help/ja_JP/scilab.xml
scilab/modules/core/help/pt_BR/scilab.xml [deleted file]
scilab/modules/core/help/ru_RU/scilab.xml

index 4236d47..d92b9d5 100644 (file)
@@ -321,6 +321,7 @@ Bug Fixes
 * [#16210](http://bugzilla.scilab.org/show_bug.cgi?id=16210): The uicontrol.units = "normalized" property was not described.
 * [#16215](http://bugzilla.scilab.org/show_bug.cgi?id=16215): `mfile2sci` badly converted the colon `:` into `mtlb(:)`
 * [#16227](http://bugzilla.scilab.org/show_bug.cgi?id=16227): `WSCI` was not defined as environment variable and could not be used as `%WSCI%` in commands sent with `host()` or `unix_*()`.
+* [#16229](http://bugzilla.scilab.org/show_bug.cgi?id=16229): Some outdated parts of the `help scilab` page were misleading.
 * [#16230](http://bugzilla.scilab.org/show_bug.cgi?id=16230): `MSWin>scilab --help` missed displaying some options like `-args..`, `-noatomsautoload`, etc.
 * [#16232](http://bugzilla.scilab.org/show_bug.cgi?id=16232): `colorbar()` did not support `$` in `colminmax`, standing for the number of colors in the current color map.
 * [#16234](http://bugzilla.scilab.org/show_bug.cgi?id=16234): Airy functions were not available.
index dcf7175..86700b6 100644 (file)
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2018 - 2019 - Samuel GOUGEON
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
           xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
@@ -16,6 +30,56 @@ scilab &lt;Options&gt;
     </refsynopsisdiv>
     <refsection role="arguments">
         <title>Options</title>
+        <para>
+            The list of Scilab launching options -- including options for developers --
+            can be displayed in the OS terminal through the <literal>--help</literal> option.
+        </para>
+        <programlisting><![CDATA[
+            unix_w(SCI+"/bin/scilab --help 2>&1")
+     ]]></programlisting>
+        <screen><![CDATA[
+--> unix_w(SCI+"/bin/scilab --help 2>&1")
+Usage: Scilab <options>
+      -args arg1 arg2..: Send directly some arg1 arg2 .. data to the session.
+                         arg1 arg2 .. values can then be read through sciargs().
+      -e Instruction   : Execute the scilab instruction given in Instruction argument.
+                         -e and -f arguments are mutually exclusive.
+      -f File          : Execute the scilab script given in File argument.
+                         -e and -f arguments are mutually exclusive.
+      -quit            : force scilab exit after execution of script from -e or -f argument.
+                         Flag ignored if it is not used with -e or -f argument.
+      -l lang          : Change the language of scilab (default : en_US).
+      -nw              : Enable console mode.
+      -nwni            : Enable terminal mode.
+      -ns              : Do not execute etc/scilab.start.
+      -nouserstartup   : Do not execute user startup files (SCIHOME/scilab.ini|.scilab).
+      -noatomsautoload : Do not autoload eligible ATOMS modules.
+      -nb              : Do not display the banner (no banner).
+      -scihome <dir>   : Force SCIHOME to <dir>.
+      -texmacs         : Option to use Scilab from documents through http://texmacs.org.
+      -version         : Display the Scilab version (no session opened).
+      -display Display : Set the display to the X server Display (XWindow systems only).
+                         unix:0.0 is the default.
+      --help           : Display this help.
+
+Developer Trace arguments:
+      --parse-trace    : Display bison state machine evolution.
+      --AST-trace      : Display ASCII-art AST to be human readable.
+      --pretty-print   : Display pretty-printed code, standard Scilab syntax.
+
+Developer Timer arguments:
+      --AST-timed      : Time each AST node.
+      --timed          : Time global execution.
+
+Developer Debug arguments:
+      --no-exec        : Only do Lexing/parsing do not execute instructions.
+      --context-dump   : Display context status.
+      --exec-verbose   : Display command before running it.
+      --timeout delay  : Kill the Scilab process after a delay.
+]]></screen>
+        <para>
+            They are described below.
+        </para>
         <variablelist>
             <varlistentry>
                 <term>-args arg#1 arg#2 ..</term>
@@ -38,7 +102,7 @@ scilab &lt;Options&gt;
                      </para>
                      <para>
                       Example:
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
+                        <screen><![CDATA[C:\Users\Me> C:\SCIdir\bin\scilab -nw -nb -noatomsautoload -args "Hello %USERNAME%" 1.2345 \"%cd%\"]]></screen>
                         <programlisting><![CDATA[
 // Inside the opened session:
 a = sciargs()
@@ -46,13 +110,18 @@ i = find(a=="-args")
 a(i+1)
 evstr(a(i+2))*2
 "This session has been launched from " + a(i+3)
-                        ]]>
-                        </programlisting>
+                     ]]></programlisting>
                         <screen><![CDATA[
 --> // Inside the opened session:
 --> a = sciargs()
  a  =
-!c:\SCIdir\bin\scilex  -nw  -nb  -noatomsautoload  -args  Hello "John"  1.2345  "C:\Users\Me" !
+! c:\SCIdir\bin\WScilex-cli.exe !
+! -nb                           !
+! -noatomsautoload              !
+! -args                         !
+! Hello John                    !
+! 1.2345                        !
+! "C:\Users\Me"                 !
 
 --> i = find(a=="-args")
  i  =
@@ -60,7 +129,7 @@ evstr(a(i+2))*2
 
 --> a(i+1)
  ans  =
- Hello "John"
+ Hello John
 
 --> evstr(a(i+2))*2
  ans  =
@@ -70,11 +139,19 @@ evstr(a(i+2))*2
  ans  =
  This session has been launched from "C:\Users\Me"
 ]]></screen>
-                     </para>
-                     <para>
-                     <note>Using <literal>-args</literal> as the <emphasis role="italic">last</emphasis> command line option is safer.
-                     </note>
-                     </para>
+                    </para>
+                    <para>
+                      Note here that <literal>>scilab -nw</literal> has been translated into
+                      <literal>Wscilex-cli.exe</literal> by the <literal>scilab</literal> batch file,
+                      in such a way that the "-nw" option is not returned by <literal>sciargs()</literal>
+                      (see further below).
+                    </para>
+                    <para>
+                        <note>
+                           Using <literal>-args</literal> as the <emphasis role="italic">last</emphasis>
+                           command line option is safer.
+                        </note>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -85,8 +162,7 @@ evstr(a(i+2))*2
                         display. Default display is unix:0.0.
                     </para>
                     <para>
-                        <literal>-display</literal> can be abbreviated by
-                        <literal>-d</literal>.
+                        <literal>-display</literal> can be abbreviated by <literal>-d</literal>.
                     </para>
                 </listitem>
             </varlistentry>
@@ -97,12 +173,16 @@ evstr(a(i+2))*2
                         At the end of the whole session startup, this option
                         <itemizedlist>
                             <listitem>
-                                <para>sets the current working directory to the shell directory from which Scilab has been launched. Please see the example given here-below for the <literal>-f</literal> option. Then,
+                                <para>
+                                    sets the current working directory to the shell directory
+                                    from which Scilab has been launched. Please see the example
+                                    given here-below for the <literal>-f</literal> option. Then,
                                 </para>
                             </listitem>
                             <listitem>
-                                <para>executes Scilab <literal>Instructions</literal> provided in a string. Example:
-                                    <screen><![CDATA[ scilab-cli -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
+                                <para>executes Scilab <literal>Instructions</literal> provided
+                                in a string. Example:
+                                    <screen><![CDATA[OS> scilab -nw -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
                                 </para>
                             </listitem>
                         </itemizedlist>
@@ -116,18 +196,24 @@ evstr(a(i+2))*2
                 <term>-f file</term>
                 <listitem>
                     <para>
-                        If this option is used, then at the beginning of the Scilab session, after the execution of the scilab and user startup files, and after the setting of user Preferences -- including the working directory ones --,
+                        If this option is used, then at the beginning of the Scilab session,
+                        after the execution of the scilab and user startup files, and after the
+                        setting of user Preferences -- including the working directory ones --,
                         <itemizedlist>
                             <listitem>
                                 <para>
-                                    the current Scilab working directory is set to the shell directory from which Scilab has been launched. For instance,
-                                    <screen><![CDATA[ D:\users\me\scilab\dev> C:\scilab-5.5.2\bin\scilex -f ..\test.sce]]></screen>
+                                    the current Scilab working directory is set to the shell
+                                    directory from which Scilab has been launched. For instance,
+                                    <screen><![CDATA[ D:\users\me\scilab\dev> C:\SCIdir\bin\scilab -f ..\test.sce]]></screen>
                                     will do a <literal>cd("D:\users\me\scilab\dev")</literal>.
                                 </para>
                             </listitem>
                             <listitem>
                                 <para>
-                                    the Scilab script <literal>file</literal> is executed. If a relative path is used (default <literal>.\</literal>, or like <literal>..\</literal> in the sample here-above), it refers to the new Scilab working directory.
+                                    the Scilab script <literal>file</literal> is executed.
+                                    If a relative path is used (default <literal>.\</literal>,
+                                    or like <literal>..\</literal> in the sample here-above),
+                                    it refers to the new Scilab working directory.
                                 </para>
                             </listitem>
                         </itemizedlist>
@@ -141,35 +227,39 @@ evstr(a(i+2))*2
                 <term>-quit</term>
                 <listitem>
                     <para>
-                        This option forces scilab to always exit after the instruction(s) passed with the <literal>-e</literal>
-                        option, or the script referred to by the <literal>-f</literal> option, have been executed,
-                        even in case of a runtime error. This option should always be used in batch mode.
-                        It is ignored if neither <literal>-e</literal> nor <literal>-f</literal> options are present.
+                        This option forces scilab to always exit after the instruction(s) passed
+                        with the <literal>-e</literal> option, or the script referred to by the
+                        <literal>-f</literal> option, have been executed, even in case of a runtime
+                        error. This option should always be used in batch mode.
+                        It is ignored if neither <literal>-e</literal> nor <literal>-f</literal>
+                        options are present.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>-l lang</term>
                 <listitem>
-                    <para>If this option is present it fixes the user language.
+                    <para>If this option is present, it sets the user language.
                         <emphasis>lang</emphasis> can be: <emphasis>ca_ES de_DE en_US es_ES
                             fr_FR ja_JP pt_BR ru_RU zh_CN zh_TW
-                        </emphasis> (from Scilab 5.2).
+                        </emphasis>.
                     </para>
                     <para>
-                        Other possible <literal>lang</literal> values are
-                        <literal>'fr'</literal> for french and <literal>'en'</literal> for
-                        English for compatibility reasons. The default language is English.
-                        This default value is fixed the <literal>scilab.start</literal> file.
+                        For compatibility reasons, other possible <literal>lang</literal> values
+                        are <literal>'fr'</literal> for french, <literal>'en'</literal> for
+                        English, or <literal>'pt'</literal> for Brasilian Portuguese.
+                        The default language is English.
                     </para>
-                    <para>On some systems, locales must be compiled to render correctly
+                    <note>
+                        On Windows, in "-nw" or "-nwni" modes, the selected font of the terminal
+                        must be a TrueType one to support UTF-8 characters, like
+                        <emphasis>Monospaced</emphasis> (best choice if available) or
+                        <emphasis>Consolas</emphasis> or <emphasis>Lucida Console</emphasis>..
+                    </note>
+                    <para>
+                        On some systems, locales must be compiled to render correctly
                         UTF-8 fonts.
                     </para>
-                    <para>Scilab can be also called the following way:</para>
-                    <screen><![CDATA[ LANG=ja_JP scilab
- # equivalent to
- scilab -l ja_JP
-]]></screen>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -187,8 +277,8 @@ evstr(a(i+2))*2
                         <literal>SCIHOME/.scilab</literal>,
                         <literal>SCIHOME/scilab.ini</literal>.
                     </para>
-                    <para>This option will disable many features in Scilab (Only use if
-                        you know what you are doing).
+                    <para>This option will disable many features in Scilab. Please use it only if
+                        you know what you are doing.
                     </para>
                 </listitem>
             </varlistentry>
@@ -204,7 +294,9 @@ evstr(a(i+2))*2
             <varlistentry>
                 <term>-noatomsautoload</term>
                 <listitem>
-                    <para>Cancels the autoloading of installed ATOMS modules at startup.</para>
+                    <para>
+                        Cancels the autoloading of installed ATOMS modules at startup.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -214,25 +306,18 @@ evstr(a(i+2))*2
                         with advanced features still available (graphics, export, xcos, scinotes, help browser, ...).
                     </para>
                     <para>
-                        From Scilab 5.2:
+                        pipes are enabled for all operating systems. See the examples for
+                        further details.
+                    </para>
+                    <para>
+                        The actual Scilab binary file executed when using the "-nw" option is
                         <itemizedlist>
                             <listitem>
-                                <para>pipes are enabled for all operating systems (see the
-                                    examples for further details).
-                                </para>
+                                on Windows: <literal>WScilex-cli.exe</literal>.
                             </listitem>
                             <listitem>
-                                <para>Scilab distribution also provides a dedicated binary which
-                                    is doing the same as <literal>-nw</literal>:
-                                    <itemizedlist>
-                                        <listitem>
-                                            Windows: <literal>WScilex-cli.exe</literal>.
-                                        </listitem>
-                                        <listitem>
-                                            <literal>scilab-adv-cli</literal> (Scilab Advanced Command Line Interpreter).
-                                        </listitem>
-                                    </itemizedlist>
-                                </para>
+                                on Linux and MacOS: <literal>scilab-adv-cli</literal>
+                                (Scilab Advanced Command Line Interpreter).
                             </listitem>
                         </itemizedlist>
                     </para>
@@ -251,27 +336,18 @@ evstr(a(i+2))*2
                         java interfaces, the Java module,... are not available.
                     </warning>
                     <para>
-                        Since Scilab 5.2:
+                        Anyway, pipes are enabled for all operating systems.
+                        See the examples for further details.
+                    </para>
+                    <para>
+                        Dedicated executable files performing the <literal>-nwni</literal> mode are
+                        provided:
                         <itemizedlist>
                             <listitem>
-                                <para>pipes are enabled for all operating systems (see the
-                                    examples for further details).
-                                </para>
+                                Windows: <literal>Scilex.exe</literal>.
                             </listitem>
-                        </itemizedlist>
-                        <itemizedlist>
                             <listitem>
-                                <para>Scilab distribution also provides a dedicated binary which
-                                    is doing the same as <literal>-nwni</literal>:
-                                    <itemizedlist>
-                                        <listitem>
-                                            Windows: <literal>Scilex.exe</literal>.
-                                        </listitem>
-                                        <listitem>
-                                            Others: <literal>scilab-cli</literal> (Scilab Command Line Interpreter).
-                                        </listitem>
-                                    </itemizedlist>
-                                </para>
+                                Others: <literal>scilab-cli</literal> (Scilab Command Line Interpreter).
                             </listitem>
                         </itemizedlist>
                     </para>
@@ -280,27 +356,42 @@ evstr(a(i+2))*2
             <varlistentry>
                 <term>-scihome dir</term>
                 <listitem>
-                    <para>Forces SCIHOME to the <literal>dir</literal> directory. If the path
-                      includes some white space, it must be specified between double-quotes (no
-                      single quotes!).
-                      if <literal>dir</literal> is a relative path, <literal>dir</literal> is add to parent standard SCIHOME folder.
-                      On Windows: %USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal>
-                      On Linux/MacOS: ~/.Scilab/<literal>dir</literal>
+                    <para>
+                        Forces SCIHOME to the <literal>dir</literal> directory. If the path
+                        includes some white space, it must be specified between
+                        double-quotes (no single quotes!).
+                        if <literal>dir</literal> is a relative path, <literal>dir</literal>
+                        is added to the parent standard SCIHOME folder.
+                        <table>
+                            <tr><td>On Windows: </td>
+                                <td>%USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal></td>
+                            </tr>
+                            <tr><td>On Linux/MacOS:</td>
+                                <td>~/.Scilab/<literal>dir</literal></td>
+                            </tr>
+                        </table>
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>--texmacs</term>
                 <listitem>
-                    <para>This option is reserved for the external TeXMacs module.
-                        This one can be priorly installed with <code>atomsInstall('texmacs')</code>.
+                    <para>
+                        This option is used when Scilab is used as computational interface
+                        within the <ulink url="http://texmacs.org">TeXmacs</ulink> scientific editor,
+                        using the <ulink url="https://atoms.scilab.org/toolboxes/texmacs">TeXmacs</ulink>
+                        ATOMS module.
+                        This one can be priorly installed in Scilab with <code>atomsInstall('texmacs')</code>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>-version</term>
                 <listitem>
-                    <para>displays the Scilab's version (before the main Scilab's startup).</para>
+                    <para>
+                        Only displays the Scilab's version in the OS terminal,
+                        without launching any Scilab session.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -402,19 +493,10 @@ evstr(a(i+2))*2
             build documentation are based on Java features. In some cases, it can be
             important to edit the JVM options (Java Virtual Machine).
         </para>
-        <para>These options are available in the
-            <emphasis>jvm_options.xml</emphasis> file.
-        </para>
-        <para>In version 5.0.X and 5.1.X, this file is stored as
-            <emphasis>SCI/modules/jvm/etc/jvm_options.xml</emphasis>.
-        </para>
-        <para>In version &gt;= 5.2.0, the file is available in
-            <emphasis>etc/jvm_options.xml</emphasis>.
-        </para>
         <para>
+            These options are available in the <emphasis>SCI/etc/jvm_options.xml</emphasis> file.
             <emphasis>
-                By default, the three following options are
-                easily accessible in the configuration file:
+                The three following options are easily accessible in this file:
             </emphasis>
         </para>
         <variablelist>
@@ -426,7 +508,9 @@ evstr(a(i+2))*2
                         value, check that the value does not exceed the memory available on
                         the system.
                     </para>
-                    <para>Since Scilab 5.4.0, this value can be changed in the preferences menu.</para>
+                    <para>
+                        This value can be changed in the preferences menu.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -473,9 +557,9 @@ scilab -debug ]]></screen>
         <para></para>
         <screen><![CDATA[
 # Under GNU/Linux, Mac OS X or Unix:
-$ echo "disp(%pi)"|scilab-cli
+$ echo "disp(%pi)" | scilab-cli
 or
-$ echo "disp(%pi)"|scilab -nwni
+$ echo "disp(%pi)" | scilab -nwni
 
 # Only open the Scilab help window:
 $ scilab-adv-cli -e "help()"
@@ -506,19 +590,34 @@ echo $? ]]></screen>
                 <link linkend="getversion">getversion</link>
             </member>
             <member>
+                <link linkend="getscilabmode">getscilabmode</link>
+            </member>
+            <member>
                 <link linkend="consolebox">consolebox</link>
             </member>
             <member>
                 <link linkend="exit">exit</link>
             </member>
+            <member>
+                <link linkend="preferences">preferences</link>
+            </member>
+            <member>
+                <ulink url="http://texmacs.org/">TeXmacs</ulink>
+            </member>
         </simplelist>
     </refsection>
     <refsection role="history">
         <title>History</title>
         <revhistory>
             <revision>
+                <revnumber>5.2.0</revnumber>
+                <revremark>Piping is enabled. Option -l lang added</revremark>
+            </revision>
+            <revision>
                 <revnumber>5.4.0</revnumber>
-                <revremark>-noatomsautoload added.</revremark>
+                <revremark>
+                    -noatomsautoload added. The Java Heap memory can be set through the preferences.
+                </revremark>
             </revision>
             <revision>
                 <revnumber>5.4.1</revnumber>
@@ -527,7 +626,35 @@ echo $? ]]></screen>
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    <literal>-quit</literal> option added. <literal>-mem</literal> option removed.
+                    <itemizedlist>
+                        <listitem>
+                            User options:
+                            <itemizedlist>
+                                <listitem>
+                                    Added: <literal>--help</literal>, <literal>-quit</literal>
+                                </listitem>
+                                <listitem>
+                                    Removed: <literal>-mem</literal>
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                        <listitem>
+                            Developer options added:
+                            <itemizedlist>
+                                <listitem>
+                                    <literal>--parse-trace</literal>, <literal>--AST-trace</literal>,
+                                    <literal>--pretty-print</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--AST-timed</literal>, <literal>--timed</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--no-exec</literal>, <literal>--exec-verbose</literal>,
+                                    <literal>--timeout delay</literal>, <literal>--context-dump</literal>.
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
             <revision>
index 9326245..7e6bb8b 100644 (file)
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2018 - 2019 - Samuel GOUGEON
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
         xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
         xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
@@ -16,6 +30,56 @@ scilab &lt;Options&gt;
     </refsynopsisdiv>
     <refsection role="arguments">
         <title>Options</title>
+        <para>
+            La liste des options de lancement de Scilab -- incluant celles à l'usage des développeurs --
+            peut être affichée dans le terminal de l'OS, en utilisant <literal>--help</literal> :
+        </para>
+        <programlisting><![CDATA[
+            unix_w(SCI+"/bin/scilab --help 2>&1")
+     ]]></programlisting>
+        <screen><![CDATA[
+--> unix_w(SCI+"/bin/scilab --help 2>&1")
+Usage: Scilab <options>
+      -args arg1 arg2..: Send directly some arg1 arg2 .. data to the session.
+                         arg1 arg2 .. values can then be read through sciargs().
+      -e Instruction   : Execute the scilab instruction given in Instruction argument.
+                         -e and -f arguments are mutually exclusive.
+      -f File          : Execute the scilab script given in File argument.
+                         -e and -f arguments are mutually exclusive.
+      -quit            : force scilab exit after execution of script from -e or -f argument.
+                         Flag ignored if it is not used with -e or -f argument.
+      -l lang          : Change the language of scilab (default : en_US).
+      -nw              : Enable console mode.
+      -nwni            : Enable terminal mode.
+      -ns              : Do not execute etc/scilab.start.
+      -nouserstartup   : Do not execute user startup files (SCIHOME/scilab.ini|.scilab).
+      -noatomsautoload : Do not autoload eligible ATOMS modules.
+      -nb              : Do not display the banner (no banner).
+      -scihome <dir>   : Force SCIHOME to <dir>.
+      -texmacs         : Option to use Scilab from documents through http://texmacs.org.
+      -version         : Display the Scilab version (no session opened).
+      -display Display : Set the display to the X server Display (XWindow systems only).
+                         unix:0.0 is the default.
+      --help           : Display this help.
+
+Developer Trace arguments:
+      --parse-trace    : Display bison state machine evolution.
+      --AST-trace      : Display ASCII-art AST to be human readable.
+      --pretty-print   : Display pretty-printed code, standard Scilab syntax.
+
+Developer Timer arguments:
+      --AST-timed      : Time each AST node.
+      --timed          : Time global execution.
+
+Developer Debug arguments:
+      --no-exec        : Only do Lexing/parsing do not execute instructions.
+      --context-dump   : Display context status.
+      --exec-verbose   : Display command before running it.
+      --timeout delay  : Kill the Scilab process after a delay.
+]]></screen>
+        <para>
+            Leur description suit ci-dessous.
+        </para>
         <variablelist>
             <varlistentry>
                 <term>-args arg#1 arg#2 ..</term>
@@ -47,7 +111,7 @@ scilab &lt;Options&gt;
                      </para>
                      <para>
                       Exemple :
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\" ]]></screen>
+                        <screen><![CDATA[C:\Users\Me> C:\SCIdir\bin\scilab -nw -nb -noatomsautoload -args "Hello %USERNAME%" 1.2345 \"%cd%\"]]></screen>
                         <programlisting><![CDATA[
 // Dans la session ouverte :
 a = sciargs()
@@ -61,7 +125,13 @@ evstr(a(i+2))*2
 --> // Dans la session ouverte :
 --> a = sciargs()
  a  =
-!c:\SCIdir\bin\scilex  -nw  -nb  -noatomsautoload  -args  Hello "John"  1.2345  "C:\Users\Me" !
+! c:\SCIdir\bin\WScilex-cli.exe !
+! -nb                           !
+! -noatomsautoload              !
+! -args                         !
+! Hello John                    !
+! 1.2345                        !
+! "C:\Users\Me"                 !
 
 --> i = find(a=="-args")
  i  =
@@ -69,7 +139,7 @@ evstr(a(i+2))*2
 
 --> a(i+1)
  ans  =
- Hello "John"
+ Hello John
 
 --> evstr(a(i+2))*2
  ans  =
@@ -80,6 +150,12 @@ evstr(a(i+2))*2
  Cette session a été lancée depuis "C:\Users\Me"
 ]]></screen>
                      </para>
+                    <para>
+                      Noter ici que <literal>>scilab -nw</literal> a été traduit en
+                      <literal>Wscilex-cli.exe</literal> par le script batch de lancement
+                      <literal>scilab</literal>, de sorte que l'option "-nw" ne figure pas dans le
+                      résultat de <literal>sciargs()</literal> (voir plus loin).
+                     </para>
                      <para>
                      <note>
                        Utiliser <literal>-args</literal> comme
@@ -97,8 +173,7 @@ evstr(a(i+2))*2
                         La valeur par défaut est unix:0.0
                     </para>
                     <para>
-                        <literal>-display</literal> peut être remplacé par
-                        <literal>-d</literal>
+                        <literal>-display</literal> peut être remplacé par <literal>-d</literal>
                     </para>
                 </listitem>
             </varlistentry>
@@ -119,7 +194,7 @@ evstr(a(i+2))*2
                                 <para>
                                   éxécute les <literal>Instructions</literal> Scilab indiquées.
                                   Exemple :
-                                    <screen><![CDATA[ scilab-cli -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb ]]></screen>
+                                    <screen><![CDATA[OS> scilab -nw -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
                                 </para>
                             </listitem>
                         </itemizedlist>
@@ -143,7 +218,7 @@ evstr(a(i+2))*2
                                 <para>
                                     le dossier de travail de Scilab est fixé au dossier système
                                     depuis lequel Scilab a été lancé. Par exemple,
-                                    <screen><![CDATA[D:\users\me\scilab\dev> C:\scilab-5.5.2\bin\scilex -f ..\test.sce]]></screen>
+                                    <screen><![CDATA[D:\users\me\scilab\dev> C:\SCIdir\bin\scilab -f ..\test.sce]]></screen>
                                     exécutera <literal>cd("D:\users\me\scilab\dev")</literal>.
                                 </para>
                             </listitem>
@@ -177,27 +252,30 @@ evstr(a(i+2))*2
             <varlistentry>
                 <term>-l lang</term>
                 <listitem>
-                    <para>Cette option permet de sélectionner la langue de
-                        l'utilisateur. <emphasis>lang</emphasis> peut avoir les valeurs:
-                        <emphasis>ca_ES de_DE en_US es_ES fr_FR ja_JP pt_BR ru_RU zh_CN
-                            zh_TW
-                        </emphasis>
-                        (à partir de Scilab 5.2).
+                    <para>
+                        Cette option permet de sélectionner la langue de l'utilisateur.
+                        <emphasis>lang</emphasis> peut avoir les valeurs suivantes :
+                        <emphasis>
+                            ca_ES de_DE en_US es_ES fr_FR ja_JP pt_BR ru_RU zh_CN zh_TW
+                        </emphasis>.
                     </para>
                     <para>
-                        Les valeurs possible pour sont <literal>-l fr</literal> pour
-                        sélectionner le francais et <literal>-l en</literal> pour
-                        sélectionner l'anglais. La langue par défaut est établie à l'anglais dans
-                        le fichier <literal>scilab.start</literal>.
+                        Pour des raisons de compatibilité, les valeurs
+                        <literal>-l fr</literal>, <literal>-l pt</literal>, ou
+                        <literal>-l en</literal> sont
+                        également utilisables, pour sélectionner le francais, le portugais
+                        (brésilien), ou l'anglais.
                     </para>
+                    <note>
+                        Sous Windows, en modes Scilab "-nw" ou "-nwni", la police sélectionnée
+                        pour le terminal doit être TrueType pour supporter l'encodage UTF-8 des
+                        polices internationales, telle que <emphasis>Monospaced</emphasis>
+                        (meilleur choix, si disponible) ou
+                        <emphasis>Consolas</emphasis> ou <emphasis>Lucida Console</emphasis>..
+                    </note>
                     <para>Avec certains systèmes, la compilation des locales peut être
                         nécessaire pour rendre correctement les polices UTF-8.
                     </para>
-                    <para>Scilab peut être aussi appellé de la manière suivante:</para>
-                    <screen><![CDATA[ LANG=ja_JP scilab
- # équivalent à
- scilab -l ja_JP
-]]></screen>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -250,26 +328,19 @@ evstr(a(i+2))*2
                         module JIMS, etc).
                     </para>
                     <para>
-                        A partir de la version 5.2 de Scilab:
+                        La redirection (piping) est disponible pour tous les systèmes
+                        d'exploitation supportés. Voir les exemples pour plus de détails.
+                    </para>
+                    <para>
+                        Le fichier Scilab executable réellement lancé lorsque l'option
+                        "-nw" est utilisée est
                         <itemizedlist>
                             <listitem>
-                                <para>Les fonctionnalités de pipe sont accessibles pour tous les
-                                    systèmes d'exploitation (voir les examples pour plus de
-                                    détails)
-                                </para>
+                                Sous Windows : <literal>WScilex-cli.exe</literal>.
                             </listitem>
                             <listitem>
-                                <para>La distribution de Scilab fournit aussi un binaire dédié
-                                    faisant la même chose que l'option <emphasis>-nw</emphasis>:
-                                    <itemizedlist>
-                                        <listitem>
-                                            Windows: <literal>WScilex-cli.exe</literal>.
-                                        </listitem>
-                                        <listitem>
-                                            <literal>scilab-adv-cli</literal> (Scilab Advanced Command Line Interpreter).
-                                        </listitem>
-                                    </itemizedlist>
-                                </para>
+                                Sous Linux ou MacOS : <literal>scilab-adv-cli</literal>
+                                (Scilab Advanced Command Line Interpreter).
                             </listitem>
                         </itemizedlist>
                     </para>
@@ -290,26 +361,19 @@ evstr(a(i+2))*2
                         ne sont pas disponibles dans ce mode.
                     </warning>
                     <para>
-                        A partir de la version 5.2 de Scilab:
+                        La redirection (piping) est disponible pour tous les systèmes
+                        d'exploitation supportés. Voir les exemples pour plus de détails.
+                    </para>
+                    <para>
+                        Le fichier Scilab executable réellement lancé lorsque l'option
+                        "-nwni" est utilisée est
                         <itemizedlist>
                             <listitem>
-                                <para>Les fonctionnalités de pipe sont accessibles pour tous les
-                                    systèmes d'exploitation (voir les exemples pour plus de
-                                    détails)
-                                </para>
+                                Sous Windows : <literal>Scilex.exe</literal>.
                             </listitem>
                             <listitem>
-                                <para>La distribution de Scilab fournit aussi un binaire dédié
-                                    faisant la même chose que l'option <emphasis>-nwni</emphasis>:
-                                    <itemizedlist>
-                                        <listitem>
-                                            Windows: <literal>Scilex.exe</literal>.
-                                        </listitem>
-                                        <listitem>
-                                            Others: <literal>scilab-cli</literal> (Scilab Command Line Interpreter).
-                                        </listitem>
-                                    </itemizedlist>
-                                </para>
+                                Sous Linux ou MacOS : <literal>scilab-cli</literal>
+                                (Scilab Command Line Interpreter).
                             </listitem>
                         </itemizedlist>
                     </para>
@@ -318,27 +382,41 @@ evstr(a(i+2))*2
             <varlistentry>
                 <term>-scihome dir</term>
                 <listitem>
-                    <para>Affecte à SCIHOME le chemin spécifié par <literal>dir</literal> (entre
-                      guillemets s'il inclut des espaces)(pas entre apostrophes !).
-                      Si <literal>dir</literal> est un chemin relatif il est ajouté au répertoire parent de SCIHOME.
-                      Sous Windows: %USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal>
-                      Sous Linux/MacOS: ~/.Scilab/<literal>dir</literal>
+                    <para>
+                        Affecte à SCIHOME le chemin spécifié par <literal>dir</literal> (entre
+                        guillemets s'il inclut des espaces)(pas entre apostrophes !).
+                        Si <literal>dir</literal> est un chemin relatif il est ajouté au répertoire
+                        parent de SCIHOME.
+                        <table>
+                            <tr><td>Sous Windows :</td>
+                                <td>%USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal></td>
+                            </tr>
+                            <tr><td>Sous Linux/MacOS :</td>
+                                <td>~/.Scilab/<literal>dir</literal></td>
+                            </tr>
+                        </table>
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>--texmacs</term>
                 <listitem>
-                    <para>Cette option est réservée au module externe TeXMacs.</para>
                     <para>
-                        Celui-ci peut être préalablement installé avec <code>atomsInstall('texmacs')</code>
+                        Cette option est utilisée lorsque Scilab est utilisé comme interface
+                        de calcul au sein du logiciel libre d'édition Scientifique <ulink url="http://texmacs.org">TeXmacs</ulink>, via le module ATOMS
+                        <ulink url="https://atoms.scilab.org/toolboxes/texmacs">TeXmacs</ulink>.
+                        Celui-ci doit être préalablement installé sous Scilab avec
+                        la commande <code>atomsInstall('texmacs')</code>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>-version</term>
                 <listitem>
-                    <para>Cette option affiche la version de Scilab.</para>
+                    <para>
+                        Cette option affiche la version de Scilab dans le terminal,
+                        sans ouvrir de session Scilab.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -445,24 +523,10 @@ evstr(a(i+2))*2
             fonctionnalités Java. Dans certains cas, il peut être intéressant de
             modifier les options de la JVM (Java Virtual Machine).
         </para>
-        <para>Ces options sont accessibles via le fichier
-            <emphasis>jvm_options.xml</emphasis>.
-        </para>
-        <para>Dans les version 5.0.X et 5.1.X, ce fichier est accessible dans
-            <emphasis>SCI/modules/jvm/etc/jvm_options.xml</emphasis>
-        </para>
-        <para>Dans les versions &gt;= 5.2.0, le fichier est accessible sous
-            <emphasis>
-                etc/jvm_options.xml<emphasis> </emphasis>
-            </emphasis>
-        </para>
         <para>
-            <emphasis>
-                <emphasis>Par défault, les trois options suivantes sont
-                    facilement accessibles à partir du fichier de
-                    configuration:
-                </emphasis>
-            </emphasis>
+            Ces options sont accessibles dans le fichier
+            <emphasis>SCI/etc/jvm_options.xml</emphasis>. En particulier, les trois
+            options suivantes sont disponibles :
         </para>
         <variablelist>
             <varlistentry>
@@ -473,6 +537,9 @@ evstr(a(i+2))*2
                         vous changez cette valeur, assurez vous que cette valeur ne dépasse
                         pas la quantité de mémoire accessible sur le système.
                     </para>
+                    <para>
+                        Cette valeur peut être réglée dans les préférences.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -521,9 +588,9 @@ scilab -debug ]]></screen>
         <para></para>
         <screen><![CDATA[
 # Sous GNU/Linux, Mac OS X or Unix:
-$ echo "disp(%pi)"|scilab-cli
+$ echo "disp(%pi)" | scilab-cli
 ou
-$ echo "disp(%pi)"|scilab -nwni
+$ echo "disp(%pi)" | scilab -nwni
 
 # Ouvre uniquement la fenêtre d'aide Scilab:
 $ scilab-adv-cli -e "help()"
@@ -553,28 +620,77 @@ echo $? ]]></screen>
                 <link linkend="getversion">getversion</link>
             </member>
             <member>
+                <link linkend="getscilabmode">getscilabmode</link>
+            </member>
+            <member>
                 <link linkend="consolebox">consolebox</link>
             </member>
             <member>
                 <link linkend="exit">exit</link>
             </member>
+            <member>
+                <link linkend="preferences">preferences</link>
+            </member>
+            <member>
+                <ulink url="http://texmacs.org/">TeXmacs</ulink>
+            </member>
         </simplelist>
     </refsection>
     <refsection role="history">
         <title>Historique</title>
         <revhistory>
             <revision>
+                <revnumber>5.2.0</revnumber>
+                <revremark>
+                    La redirection est disponible (piping). Option -l lang ajoutée.
+                </revremark>
+            </revision>
+            <revision>
                 <revnumber>5.4.0</revnumber>
-                <revremark>-noatomsautoload ajouté.</revremark>
+                <revremark>
+                    -noatomsautoload ajoutée.
+                    La mémoire JVM réservée est réglable dans les préférences.
+                </revremark>
             </revision>
             <revision>
                 <revnumber>5.4.1</revnumber>
-                <revremark>scinotes et xcos peuvent maintenant être démarrés en ligne de commande. Voir le SEP #87.</revremark>
+                <revremark>
+                    scinotes et xcos peuvent maintenant être démarrés en ligne de commande.
+                    Voir le SEP #87.
+                </revremark>
             </revision>
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    Option <literal>-quit</literal> ajoutée. Option <literal>-mem</literal> supprimée.
+                    <itemizedlist>
+                        <listitem>
+                            Options pour l'utilisateur :
+                            <itemizedlist>
+                                <listitem>
+                                    Ajoutées : <literal>--help</literal>, <literal>-quit</literal>
+                                </listitem>
+                                <listitem>
+                                    Supprimée : <literal>-mem</literal>
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                        <listitem>
+                            Options ajoutées pour les développeurs :
+                            <itemizedlist>
+                                <listitem>
+                                    <literal>--parse-trace</literal>, <literal>--AST-trace</literal>,
+                                    <literal>--pretty-print</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--AST-timed</literal>, <literal>--timed</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--no-exec</literal>, <literal>--exec-verbose</literal>,
+                                    <literal>--timeout delay</literal>, <literal>--context-dump</literal>.
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
             <revision>
index 30acf69..684fab0 100644 (file)
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2018 - 2019 - Samuel GOUGEON
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
     xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
@@ -17,6 +31,56 @@ scilab &lt;Options&gt;
     </refsynopsisdiv>
     <refsection role="arguments">
         <title>説定</title>
+        <para>
+            The list of Scilab launching options -- including options for developers --
+            can be displayed in the OS terminal through the <literal>--help</literal> option.
+        </para>
+        <programlisting><![CDATA[
+            unix_w(SCI+"/bin/scilab --help 2>&1")
+     ]]></programlisting>
+        <screen><![CDATA[
+--> unix_w(SCI+"/bin/scilab --help 2>&1")
+Usage: Scilab <options>
+      -args arg1 arg2..: Send directly some arg1 arg2 .. data to the session.
+                         arg1 arg2 .. values can then be read through sciargs().
+      -e Instruction   : Execute the scilab instruction given in Instruction argument.
+                         -e and -f arguments are mutually exclusive.
+      -f File          : Execute the scilab script given in File argument.
+                         -e and -f arguments are mutually exclusive.
+      -quit            : force scilab exit after execution of script from -e or -f argument.
+                         Flag ignored if it is not used with -e or -f argument.
+      -l lang          : Change the language of scilab (default : en_US).
+      -nw              : Enable console mode.
+      -nwni            : Enable terminal mode.
+      -ns              : Do not execute etc/scilab.start.
+      -nouserstartup   : Do not execute user startup files (SCIHOME/scilab.ini|.scilab).
+      -noatomsautoload : Do not autoload eligible ATOMS modules.
+      -nb              : Do not display the banner (no banner).
+      -scihome <dir>   : Force SCIHOME to <dir>.
+      -texmacs         : Option to use Scilab from documents through http://texmacs.org.
+      -version         : Display the Scilab version (no session opened).
+      -display Display : Set the display to the X server Display (XWindow systems only).
+                         unix:0.0 is the default.
+      --help           : Display this help.
+
+Developer Trace arguments:
+      --parse-trace    : Display bison state machine evolution.
+      --AST-trace      : Display ASCII-art AST to be human readable.
+      --pretty-print   : Display pretty-printed code, standard Scilab syntax.
+
+Developer Timer arguments:
+      --AST-timed      : Time each AST node.
+      --timed          : Time global execution.
+
+Developer Debug arguments:
+      --no-exec        : Only do Lexing/parsing do not execute instructions.
+      --context-dump   : Display context status.
+      --exec-verbose   : Display command before running it.
+      --timeout delay  : Kill the Scilab process after a delay.
+]]></screen>
+        <para>
+            They are described below.
+        </para>
         <variablelist>
             <varlistentry>
                 <term>-args arg#1 arg#2 ..</term>
@@ -39,7 +103,7 @@ scilab &lt;Options&gt;
                      </para>
                      <para>
                       Example:
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
+                        <screen><![CDATA[C:\Users\Me> C:\SCIdir\bin\scilab -nw -nb -noatomsautoload -args "Hello %USERNAME%" 1.2345 \"%cd%\"]]></screen>
                         <programlisting><![CDATA[
 // Inside the opened session:
 a = sciargs()
@@ -47,13 +111,18 @@ i = find(a=="-args")
 a(i+1)
 evstr(a(i+2))*2
 "This session has been launched from " + a(i+3)
-                        ]]>
-                        </programlisting>
+                     ]]></programlisting>
                         <screen><![CDATA[
 --> // Inside the opened session:
 --> a = sciargs()
  a  =
-!c:\SCIdir\bin\scilex  -nw  -nb  -noatomsautoload  -args  Hello "John"  1.2345  "C:\Users\Me" !
+! c:\SCIdir\bin\WScilex-cli.exe !
+! -nb                           !
+! -noatomsautoload              !
+! -args                         !
+! Hello John                    !
+! 1.2345                        !
+! "C:\Users\Me"                 !
 
 --> i = find(a=="-args")
  i  =
@@ -61,7 +130,7 @@ evstr(a(i+2))*2
 
 --> a(i+1)
  ans  =
- Hello "John"
+ Hello John
 
 --> evstr(a(i+2))*2
  ans  =
@@ -70,10 +139,14 @@ evstr(a(i+2))*2
 --> "This session has been launched from " + a(i+3)
  ans  =
  This session has been launched from "C:\Users\Me"
-
--->
 ]]></screen>
                      </para>
+                    <para>
+                      Note here that <literal>> scilab -nw</literal> has been translated into
+                      <literal>Wscilex-cli.exe</literal> by the <literal>scilab</literal> batch file,
+                      in such a way that the "-nw" option is not returned by <literal>sciargs()</literal>
+                      (see further below).
+                    </para>
                      <para>
                      <note>Using <literal>-args</literal> as the <emphasis role="italic">last</emphasis> command line option is safer.
                      </note>
@@ -84,13 +157,11 @@ evstr(a(i+2))*2
                 <term>-display Display</term>
                 <listitem>
                     <para>
-                        Xwindow システム上でのみ使用可能で, 表示する
-                        Xサーバーを指定します.
+                        Xwindow システム上でのみ使用可能で, 表示する Xサーバーを指定します.
                         デフォルトの表示先は unix:0.0 です.
                     </para>
                     <para>
-                        <literal>-display</literal> は,
-                        <literal>-d</literal>と短縮形で指定できます.
+                        <literal>-display</literal> は, <literal>-d</literal>と短縮形で指定できます.
                     </para>
                 </listitem>
             </varlistentry>
@@ -106,7 +177,7 @@ evstr(a(i+2))*2
                             </listitem>
                             <listitem>
                                 <para>executes Scilab <literal>Instructions</literal> provided in a string. Example:
-                                    <screen><![CDATA[ scilab-cli -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
+                                    <screen><![CDATA[OS> scilab -nw -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
                                 </para>
                             </listitem>
                         </itemizedlist>
@@ -125,7 +196,7 @@ evstr(a(i+2))*2
                             <listitem>
                                 <para>
                                     the current Scilab working directory is set to the shell directory from which Scilab has been launched. For instance,
-                                    <screen><![CDATA[ D:\users\me\scilab\dev> C:\scilab-5.5.2\bin\scilex -f ..\test.sce]]></screen>
+                                    <screen><![CDATA[ D:\users\me\scilab\dev> C:\SCIdir\bin\scilab -f ..\test.sce]]></screen>
                                     will do a <literal>cd("D:\users\me\scilab\dev")</literal>.
                                 </para>
                             </listitem>
@@ -154,24 +225,24 @@ evstr(a(i+2))*2
                 <listitem>
                     <para>このオプションを指定した場合,
                         ユーザ言語を指定します.
-                        <emphasis>lang</emphasis> は以下の値を指定できます: <emphasis>ca_ES de_DE en_US es_ES
-                            fr_FR ja_JP pt_BR ru_RU zh_CN zh_TW
+                        <emphasis>lang</emphasis> は以下の値を指定できます:
+                        <emphasis>
+                            ca_ES de_DE en_US es_ES fr_FR ja_JP pt_BR ru_RU zh_CN zh_TW
                         </emphasis>
-                        (Scilab 5.2以降).
                     </para>
                     <para>
                         互換性維持のため,その他に <literal>lang</literal> の値は,フランス語として
-                        <literal>'fr'</literal> および英語として <literal>'en'</literal> を使用可能です.
-                        デフォルト値は,<literal>scilab.start</literal>ファイルで指定されます.
+                        <literal>'fr'</literal> および英語として <literal>'en'</literal> を使用可能です, or <literal>'pt'</literal> for Brasilian Portuguese.
                     </para>
+                    <note>
+                        On Windows, in "-nw" or "-nwni" modes, the selected font of the terminal
+                        must be a TrueType one to support UTF-8 characters, like
+                        <emphasis>Monospaced</emphasis> (best choice if available) or
+                        <emphasis>Consolas</emphasis> or <emphasis>Lucida Console</emphasis>..
+                    </note>
                     <para>いくつかのシステムでは,UTF-8フォントを正しく描画するために,
                         ロケールをコンパイルする必要があります.
                     </para>
-                    <para>Scilab を以下のようにコールすることも可能です:</para>
-                    <screen><![CDATA[ LANG=ja_JP scilab
- # これは以下と等価です
- scilab -l ja_JP
-]]></screen>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -222,27 +293,21 @@ evstr(a(i+2))*2
                         先進的な機能(グラフィック, export, xcos, scinotes, ヘルプブラウザ, ...)
                         と共にコマンドラインで起動されます.
                     </para>
-                    <para>Scilab 5.2以降:</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>全てのオペレーティングシステムについて
-                                パイプが有効です (詳細については例を参照ください).
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>Scilab のディストリビューションには,
-                                <literal>-nw</literal>と同様のバイナリを提供します:
-                                <itemizedlist>
-                                    <listitem>
-                                        Windows: <literal>WScilex-cli.exe</literal>.
-                                    </listitem>
-                                    <listitem>
-                                        <literal>scilab-adv-cli</literal> (Scilab Advanced Command Line Interpreter).
-                                    </listitem>
-                                </itemizedlist>
-                            </para>
-                        </listitem>
-                    </itemizedlist>
+                    <para>
+                        全てのオペレーティングシステムについて パイプが有効です (詳細については例を参照ください).
+                    </para>
+                    <para>
+                        Scilab のディストリビューションには, <literal>-nw</literal>と同様のバイナリを提供します:
+                        <itemizedlist>
+                            <listitem>
+                                Windows: <literal>WScilex-cli.exe</literal>.
+                            </listitem>
+                            <listitem>
+                                on Linux and MacOS: <literal>scilab-adv-cli</literal>
+                                (Scilab Advanced Command Line Interpreter).
+                            </listitem>
+                        </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -255,55 +320,60 @@ evstr(a(i+2))*2
                         (グラフィック, export, xcos, scinotes, ヘルプブラウザ, ...)なしで
                         コマンドラインで起動されます.
                     </para>
-                    <para>Scilab 5.2以降:</para>
-                    <itemizedlist>
-                        <listitem>
-                            <para>全てのオペレーティングシステムについて
-                                パイプが有効です (詳細については例を参照ください).
-                            </para>
-                        </listitem>
-                        <listitem>
-                            <para>
-                                Scilab のディストリビューションでは,
-                                <literal>-nwni</literal>と同じ専用バイナリが提供されています
-                                <itemizedlist>
-                                    <listitem>
-                                        Windows: <literal>Scilex.exe</literal>.
-                                    </listitem>
-                                    <listitem>
-                                        Others: <literal>scilab-cli</literal> (Scilab Command Line Interpreter).
-                                    </listitem>
-                                </itemizedlist>
-                            </para>
-                        </listitem>
-                    </itemizedlist>
+                    <para>
+                        全てのオペレーティングシステムについて パイプが有効です (詳細については例を参照ください).
+                    </para>
+                    <para>
+                        Scilab のディストリビューションでは,
+                        <literal>-nwni</literal>と同じ専用バイナリが提供されています
+                        <itemizedlist>
+                            <listitem>
+                                Windows: <literal>Scilex.exe</literal>.
+                            </listitem>
+                            <listitem>
+                                Others: <literal>scilab-cli</literal> (Scilab Command Line Interpreter).
+                            </listitem>
+                        </itemizedlist>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>-scihome dir</term>
                 <listitem>
-                    <para>Forces SCIHOME to the <literal>dir</literal> directory. If the path
-                      includes some white space, it must be specified between double-quotes (no
-                      single quotes!).
-                      if <literal>dir</literal> is a relative path, <literal>dir</literal> is add to parent standard SCIHOME folder.
-                      On Windows: %USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal>
-                      On Linux/MacOS: ~/.Scilab/<literal>dir</literal>
+                    <para>
+                        Forces SCIHOME to the <literal>dir</literal> directory. If the path
+                        includes some white space, it must be specified between double-quotes (no
+                        single quotes!).
+                        if <literal>dir</literal> is a relative path, <literal>dir</literal> is add to parent standard SCIHOME folder.
+                        <table>
+                            <tr><td>On Windows: </td>
+                                <td>%USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal></td>
+                            </tr>
+                            <tr><td>On Linux/MacOS:</td>
+                                <td>~/.Scilab/<literal>dir</literal></td>
+                            </tr>
+                        </table>
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>--texmacs</term>
                 <listitem>
-                    <para>このオプションは TeXMacs用に予約されています.</para>
                     <para>
-                        ATOMSモジュールをインストールしてください: <programlisting role="">atomsInstall('texmacs')</programlisting>
+                        This option is used when Scilab is used as computational interface
+                        within the <ulink url="http://texmacs.org">TeXmacs</ulink> scientific editor,
+                        using the <ulink url="https://atoms.scilab.org/toolboxes/texmacs">TeXmacs</ulink>
+                        ATOMS module.
+                        This one can be priorly installed in Scilab with <code>atomsInstall('texmacs')</code>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>-version</term>
                 <listitem>
-                    <para>このオプションはプロダクトのバージョンを出力し,終了します.</para>
+                    <para>
+                        このオプションはプロダクトのバージョンを出力し,終了します. No Scilab session is opened.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -415,19 +485,8 @@ evstr(a(i+2))*2
             JVM (Java仮想マシン)オプションを編集することが重要となります.
         </para>
         <para>これらのオプションは,
-            <emphasis>jvm_options.xml</emphasis>ファイルで利用可能です.
-        </para>
-        <para>5.0.X および 5.1.Xでは, このファイルは
-            <emphasis>SCI/modules/jvm/etc/jvm_options.xml</emphasis>に保存されています.
-        </para>
-        <para>&gt;= 5.2.0以降, このファイルは
-            <emphasis>
-                etc/jvm_options.xml<emphasis> </emphasis>
-            </emphasis>
-            にあります.
-        </para>
-        <para>デフォルトで, 以下の3つのオプションが
-            設定ファイルで容易にアクセス可能です:
+            <emphasis>SCI/etc/jvm_options.xml</emphasis>ファイルで利用可能です.
+            デフォルトで, 以下の3つのオプションが  設定ファイルで容易にアクセス可能です:
         </para>
         <variablelist>
             <varlistentry>
@@ -440,7 +499,7 @@ evstr(a(i+2))*2
                         超えないことを確認してください.
                     </para>
                     <para>
-                        Scilab 5.4.0以降, この値は設定メニュー内で変更可能です.
+                        この値は設定メニュー内で変更可能です.
                     </para>
                 </listitem>
             </varlistentry>
@@ -491,9 +550,9 @@ scilab -debug ]]></screen>
         <para></para>
         <screen><![CDATA[
 # Under GNU/Linux, Mac OS X or Unix:
-$ echo "disp(%pi)"|scilab-cli
+$ echo "disp(%pi)" | scilab-cli
 or
-$ echo "disp(%pi)"|scilab -nwni
+$ echo "disp(%pi)" | scilab -nwni
 # Only open the Scilab help window:
 $ scilab-adv-cli -e "help()"
 or
@@ -521,19 +580,35 @@ echo $? ]]></screen>
                 <link linkend="getversion">getversion</link>
             </member>
             <member>
+                <link linkend="getscilabmode">getscilabmode</link>
+            </member>
+            <member>
                 <link linkend="consolebox">consolebox</link>
             </member>
             <member>
                 <link linkend="exit">exit</link>
             </member>
+            <member>
+                <link linkend="preferences">preferences</link>
+            </member>
+            <member>
+                <ulink url="http://texmacs.org/">TeXmacs</ulink>
+            </member>
         </simplelist>
     </refsection>
     <refsection role="history">
         <title>履歴</title>
         <revhistory>
             <revision>
+                <revnumber>5.2.0</revnumber>
+                <revremark>Piping is enabled. Option -l lang added</revremark>
+            </revision>
+            <revision>
                 <revnumber>5.4.0</revnumber>
-                <revremark>-noatomsautoload が追加されました.</revremark>
+                <revremark>
+                    -noatomsautoload が追加されました.
+                    The Java Heap memory can be set through the preferences.
+                </revremark>
             </revision>
             <revision>
                 <revnumber>5.4.1</revnumber>
@@ -542,7 +617,35 @@ echo $? ]]></screen>
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    <literal>-quit</literal> option added. <literal>-mem</literal> option removed.
+                    <itemizedlist>
+                        <listitem>
+                            User options:
+                            <itemizedlist>
+                                <listitem>
+                                    Added: <literal>--help</literal>, <literal>-quit</literal>
+                                </listitem>
+                                <listitem>
+                                    Removed: <literal>-mem</literal>
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                        <listitem>
+                            Developer options added:
+                            <itemizedlist>
+                                <listitem>
+                                    <literal>--parse-trace</literal>, <literal>--AST-trace</literal>,
+                                    <literal>--pretty-print</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--AST-timed</literal>, <literal>--timed</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--no-exec</literal>, <literal>--exec-verbose</literal>,
+                                    <literal>--timeout delay</literal>, <literal>--context-dump</literal>.
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
             <revision>
diff --git a/scilab/modules/core/help/pt_BR/scilab.xml b/scilab/modules/core/help/pt_BR/scilab.xml
deleted file mode 100644 (file)
index e77878d..0000000
+++ /dev/null
@@ -1,475 +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:ns3="http://www.w3.org/1999/xhtml"
-        xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
-        xmlns:scilab="http://www.scilab.org" xml:id="scilab" xml:lang="pt">
-    <refnamediv>
-        <refname>scilab</refname>
-        <refpurpose>principal script para executar o Scilab e ferramentas de miscelânea
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Sqeüência de Chamamento</title>
-        <synopsis>
-scilab &lt;Options&gt;
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection role="arguments">
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>-args arg#1 arg#2 ..</term>
-                <listitem>
-                    <para>
-                        This option allows to send some data to the Scilab session:
-                        <itemizedlist>
-                            <listitem>Consecutive data are separated by one or several spaces.
-                            </listitem>
-                            <listitem>An expression between double-quotes is a single data.
-                            </listitem>
-                            <listitem>To include a double-quote in a data, write <literal>\"</literal> instead of <literal>"</literal>.
-                            </listitem>
-                            <listitem>The single quote <literal>'</literal> is a regular character. It has no special meaning.
-                            </listitem>
-                        </itemizedlist>
-                    </para>
-                    <para>
-                      Inside the opened session, these data can be retrieved as separated strings with <link linkend="sciargs">sciargs()</link>.
-                     </para>
-                     <para>
-                      Example:
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -args "Hello \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
-                        <programlisting><![CDATA[
-// Inside the opened session:
-a = sciargs()
-i = find(a=="-args")
-a(i+1)
-evstr(a(i+2))*2
-"This session has been launched from " + a(i+3)
-                        ]]>
-                        </programlisting>
-                        <screen><![CDATA[
---> // Inside the opened session:
---> a = sciargs()
- a  =
-!c:\SCIdir\bin\scilex  -nw  -nb  -noatomsautoload  -args  Hello "John"  1.2345  "C:\Users\Me" !
-
---> i = find(a=="-args")
- i  =
-    5.
-
---> a(i+1)
- ans  =
- Hello "John"
-
---> evstr(a(i+2))*2
- ans  =
-    2.469
-
---> "This session has been launched from " + a(i+3)
- ans  =
- This session has been launched from "C:\Users\Me"
-
--->
-]]></screen>
-                     </para>
-                     <para>
-                     <note>Using <literal>-args</literal> as the <emphasis role="italic">last</emphasis> command line option is safer.
-                     </note>
-                     </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-display Display</term>
-                <listitem>
-                    <para>Para uso apenas em sistemas Xwindow para ajustar um display de
-                        servidor X. O display padrão é unix:0.0
-                    </para>
-                    <para>
-                        <literal>-display</literal> pode ser abreviado por
-                        <literal>-d</literal>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-e Instructions</term>
-                <listitem>
-                    <para>
-                        No final de toda a sessão de inicialização, esta opção
-                        <itemizedlist>
-                            <listitem>
-                                <para>Define o diretório de trabalho atual para o diretório shell do qual o Scilab foi lançado. Por favor veja o exemplo dado aqui-abaixo para a opção <literal> -f </literal>. Então,
-                                </para>
-                            </listitem>
-                            <listitem>
-                                <para>executa dado Scilab <literal>Instructions</literal>. Exemplo :
-                                    <screen><![CDATA[ scilab-cli -e  "disp(\"Hello\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
-                                </para>
-                            </listitem>
-                        </itemizedlist>
-                    </para>
-                    <warning>
-                        As opções <literal>-e</literal> e <literal>-f</literal> são mutuamente exclusivas.
-                    </warning>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-f file</term>
-                <listitem>
-                    <para>
-                        If this option is used, then at the beginning of the Scilab session, after the execution of the scilab and user startup files, and after the setting of user Preferences -- including the working directory ones --,
-                        <itemizedlist>
-                            <listitem>
-                                <para>
-                                    the current Scilab working directory is set to the shell directory from which Scilab has been launched. For instance,
-                                    <screen><![CDATA[ D:\users\me\scilab\dev> C:\scilab-5.5.2\bin\scilex -f ..\test.sce]]></screen>
-                                    will do a <literal>cd("D:\users\me\scilab\dev")</literal>.
-                                </para>
-                            </listitem>
-                            <listitem>
-                                <para>
-                                    the Scilab script <literal>file</literal> is executed. If a relative path is used (default <literal>.\</literal>, or like <literal>..\</literal> in the sample here-above), it refers to the new Scilab working directory.
-                                </para>
-                            </listitem>
-                        </itemizedlist>
-                    </para>
-                    <para>
-                        A file with .xcos extension will be opened by Xcos.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-quit</term>
-                <listitem>
-                    <para>This option forces scilab to always exit after the instruction(s) passed with the <literal>-e</literal>
-                    option, or the script referred to by the <literal>-f</literal> option, have been executed,
-                    even in case of a runtime error. This option should always be used in batch mode.
-                    It is ignored if neither <literal>-e</literal> nor <literal>-f</literal> options are present.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-l idioma</term>
-                <listitem>
-                    <para>Se esta opção estiver presente, ela fica o idioma do usuário.
-                        Os possíveis valores para <literal>idioma</literal> são
-                        <literal>'fr'</literal> para francês, <literal>'en'</literal> para
-                        inglês e 'br' para português brasileiro. O idioma padrão é inglês. O
-                        valor padrão é fixado no arquivo
-                        <literal>scilab.start</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-nb</term>
-                <listitem>
-                    <para>"no banner" : Se esta opção está presente, então o cartão de boas-vindas não é impresso.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-ns</term>
-                <listitem>
-                    <para>"No Startup files" : Se esta opção está presente, o arquivo de inicialização
-                        <literal>SCI/etc/scilab.start</literal> e os arquivos de
-                        inicialização do usuário <literal>SCIHOME/.scilab</literal>,
-                        <literal>SCIHOME/scilab.ini</literal> não são executados.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-nouserstartup</term>
-                <listitem>
-                    <para>Se esta opção estiver presente, os arquivos de inicialização
-                        do usuário <literal>SCIHOME/.scilab</literal>,
-                        <literal>SCIHOME/scilab.ini</literal> não são executados.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-nw</term>
-                <listitem>
-                    <para>Se esta opção estiver presente, então o Scilab não é executado
-                        em uma janela específica.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-nwni / -nogui</term>
-                <listitem>
-                    <important>
-                        This mode prevents loading the Java Virtual Machine.
-                        It starts faster and uses less memory.
-                    </important>
-                    <para>Se esta opção estiver presente, então o Scilab não é executado
-                        em uma janela específica e não aceita interação do usuário
-                        (graphics, export, xcos, scinotes, help browser, Java module,...).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-scihome dir</term>
-                <listitem>
-                    <para>Forces SCIHOME to the <literal>dir</literal> directory. If the path
-                      includes some white space, it must be specified between double-quotes (no
-                      single quotes!).
-                      if <literal>dir</literal> is a relative path, <literal>dir</literal> is add to parent standard SCIHOME folder.
-                      On Windows: %USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal>
-                      On Linux/MacOS: ~/.Scilab/<literal>dir</literal>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>--texmacs</term>
-                <listitem>
-                    <para>Esta opção é reservada para TexMacs.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-version</term>
-                <listitem>
-                    <para>Esta opção imprime a versão do Scilab.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection role="arguments">
-        <title>Additional options for Unix/Linux and Mac OS X</title>
-        <para>Advice: use theses options on a Scilab source tree.</para>
-        <variablelist>
-            <varlistentry>
-                <term>-debug</term>
-                <listitem>
-                    <para>Inicia o Scilab no debugger gdb.</para>
-                    <para>
-                        The variable <literal>SCILAB_GDB_OPT</literal> may be set to add custom options to gdb.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-debug-rr</term>
-                <listitem>
-                    <para>Start Scilab under <ulink url="https://rr-project.org/">rr</ulink>.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-debug-kdbg</term>
-                <listitem>
-                    <para>Start Scilab under kdbg.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-profiling</term>
-                <listitem>
-                    <para>Start Scilab under valgrind.</para>
-                    <para>The variable SCILAB_VALGRIND_OPT may be set to add custom options
-                        to valgrind (and override the existing valgrind options).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-profiling-visu</term>
-                <listitem>
-                    <para>Start Scilab under callgrind.</para>
-                    <para>The variable SCILAB_VALGRIND_OPT may be set to add custom options
-                        to callgrind (and override the existing callgrind options).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-electric-fence</term>
-                <listitem>
-                    <para>Start Scilab with the Electric Fence.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection role="description">
-        <title>Environment variables</title>
-        <variablelist>
-            <varlistentry>
-                <term>SCIVERBOSE</term>
-                <listitem>
-                    <para>
-                        If this variable is present, Scilab startup script will show a startup debug information.
-                        Mainly used for bug report and debugging purposes.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>JAVA_HOME</term>
-                <listitem>
-                    <para>
-                        Specify which Java to use. For example,
-                        <literal>JAVA_HOME=/usr/lib/jvm/java-7-openjdk/ scilab</literal> will start Scilab with Java 7.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>SCI_DISABLE_TK</term>
-                <listitem>
-                    <para>Disable Tk (but not Tcl) features.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>SCI_JAVA_ENABLE_HEADLESS</term>
-                <listitem>
-                    <para>
-                        Enable Java Headless VM (i.e. without GUI features).
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection role="description">
-        <title>Java Virtual Machine options</title>
-        <warning>
-            The options described here-below are useless and are cancelled if the option <literal>-nwni</literal> is used.
-        </warning>
-        <para>Starting from Scilab 5.0, the graphical user interface (GUI) and the
-            build documentation are based on Java features. In some cases, it can be
-            important to edit the JVM options (Java Virtual Machine).
-        </para>
-        <para>These options are available in the
-            <emphasis>jvm_options.xml</emphasis> file.
-        </para>
-        <para>In version 5.0.X and 5.1.X, this file is stored as
-            <emphasis>SCI/modules/jvm/etc/jvm_options.xml</emphasis>.
-        </para>
-        <para>In version &gt;= 5.2.0, the file is available in
-            <emphasis>etc/jvm_options.xml</emphasis>.
-        </para>
-        <para>
-            <emphasis>
-                By default, the three following options are
-                easily accessible in the configuration file:
-            </emphasis>
-        </para>
-        <variablelist>
-            <varlistentry>
-                <term>-XmxXXXm</term>
-                <listitem>
-                    <para>This option set the amount of memory available by the Java
-                        Virtual Machine. By default, 256M are allocated. If you change this
-                        value, check that the value does not exceed the memory available on
-                        the system.
-                    </para>
-                    <para>Since Scilab 5.4.0, this value can be changed in the preferences menu.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-Djava.compiler=JIT</term>
-                <listitem>
-                    <para>
-                        This option with the argument <emphasis>JIT</emphasis> enables
-                        the Java Just In Time compiler. It is activated by default.
-                        <emphasis>NONE</emphasis> disables the JIT and decreases
-                        dramatically performances.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>-verbose:jni / -Xcheck:jni</term>
-                <listitem>
-                    <para>These options enable more checks and output from the JNI
-                        calls. These options are useful in case of debugging and are
-                        disabled by default since they decreases performances.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <para>Many more options are available. They can improve the performances,
-            change look and feel, change memory managements... See: <ulink url="http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html">http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html</ulink>.
-        </para>
-    </refsection>
-    <refsection role="examples">
-        <title>Exemplos</title>
-        <screen><![CDATA[
-# Let's start Scilab in profiling mode without attaching a gdb once a SIGSEGV is met.
-# We are under Bash shell
-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
-# Now set the custom option
-# We are under Bash shell
-export SCILAB_GDB_OPT="--command=debug.txt"
-# Start Scilab in debug mode
-scilab -debug ]]></screen>
-        <para></para>
-        <screen><![CDATA[
-# Under GNU/Linux, Mac OS X or Unix:
-$ echo "disp(%pi)"|scilab-cli
-or
-$ echo "disp(%pi)"|scilab -nwni
-
-# Only open the Scilab help window:
-$ 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 $? ]]></screen>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="startup">startup</link>
-            </member>
-            <member>
-                <link linkend="sciargs">sciargs</link>
-            </member>
-            <member>
-                <link linkend="getpid">getpid</link>
-            </member>
-            <member>
-                <link linkend="getenv">getenv</link>
-            </member>
-            <member>
-                <link linkend="getversion">getversion</link>
-            </member>
-            <member>
-                <link linkend="consolebox">consolebox</link>
-            </member>
-            <member>
-                <link linkend="exit">exit</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>Histórico</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.4.0</revnumber>
-                <revremark>-noatomsautoload added.</revremark>
-            </revision>
-            <revision>
-                <revnumber>5.4.1</revnumber>
-                <revremark>scinotes and xcos individual scripts introduced. See SEP #87.</revremark>
-            </revision>
-            <revision>
-                <revnumber>6.0.0</revnumber>
-                <revremark>
-                    <literal>-quit</literal> option added. <literal>-mem</literal> option removed.
-                </revremark>
-            </revision>
-            <revision>
-                <revnumber>6.0.1</revnumber>
-                <revremark>
-                    <literal>-scihome</literal> option added.
-                </revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-    <!--add some kewywords -->
-    <refnamediv xml:id="wscilex"></refnamediv>
-    <refnamediv xml:id="wscilex-cli"></refnamediv>
-    <refnamediv xml:id="scilex"></refnamediv>
-    <refnamediv xml:id="scilab-cli"></refnamediv>
-    <refnamediv xml:id="scilab-adv-cli"></refnamediv>
-</refentry>
index 7803656..c353247 100644 (file)
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2018 - 2019 - Samuel GOUGEON
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
     xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
@@ -17,6 +31,57 @@ scilab &lt;Options&gt;
     </refsynopsisdiv>
     <refsection role="arguments">
         <title>Аргументы</title>
+        <para>
+            Список опций запуска Scilab'а -- включая опции для разработчиков --,
+            которые могут быть отображены в терминале операционной системы через опцию
+            <literal>--help</literal>.
+        </para>
+        <programlisting><![CDATA[
+            unix_w(SCI+"/bin/scilab --help 2>&1")
+     ]]></programlisting>
+        <screen><![CDATA[
+--> unix_w(SCI+"/bin/scilab --help 2>&1")
+Usage: Scilab <options>
+      -args arg1 arg2..: Send directly some arg1 arg2 .. data to the session.
+                         arg1 arg2 .. values can then be read through sciargs().
+      -e Instruction   : Execute the scilab instruction given in Instruction argument.
+                         -e and -f arguments are mutually exclusive.
+      -f File          : Execute the scilab script given in File argument.
+                         -e and -f arguments are mutually exclusive.
+      -quit            : force scilab exit after execution of script from -e or -f argument.
+                         Flag ignored if it is not used with -e or -f argument.
+      -l lang          : Change the language of scilab (default : en_US).
+      -nw              : Enable console mode.
+      -nwni            : Enable terminal mode.
+      -ns              : Do not execute etc/scilab.start.
+      -nouserstartup   : Do not execute user startup files (SCIHOME/scilab.ini|.scilab).
+      -noatomsautoload : Do not autoload eligible ATOMS modules.
+      -nb              : Do not display the banner (no banner).
+      -scihome <dir>   : Force SCIHOME to <dir>.
+      -texmacs         : Option to use Scilab from documents through http://texmacs.org.
+      -version         : Display the Scilab version (no session opened).
+      -display Display : Set the display to the X server Display (XWindow systems only).
+                         unix:0.0 is the default.
+      --help           : Display this help.
+
+Developer Trace arguments:
+      --parse-trace    : Display bison state machine evolution.
+      --AST-trace      : Display ASCII-art AST to be human readable.
+      --pretty-print   : Display pretty-printed code, standard Scilab syntax.
+
+Developer Timer arguments:
+      --AST-timed      : Time each AST node.
+      --timed          : Time global execution.
+
+Developer Debug arguments:
+      --no-exec        : Only do Lexing/parsing do not execute instructions.
+      --context-dump   : Display context status.
+      --exec-verbose   : Display command before running it.
+      --timeout delay  : Kill the Scilab process after a delay.
+]]></screen>
+        <para>
+            Они описаны ниже.
+        </para>
         <variablelist>
             <varlistentry>
                 <term>-args arg№1 arg№2 ..</term>
@@ -31,19 +96,22 @@ scilab &lt;Options&gt;
                               Выражение между двойными кавычками является единым куском данных.
                             </listitem>
                             <listitem>
-                              Чтобы внести двойные кавычки в данные, запишите <literal>\"</literal> вместо <literal>"</literal>.
+                              Чтобы внести двойные кавычки в данные, запишите <literal>\"</literal>
+                              вместо <literal>"</literal>.
                             </listitem>
                             <listitem>
-                              Одинарная кавычка <literal>'</literal> является обычным символом. У неё нет специального значения.
+                              Одинарная кавычка <literal>'</literal> является обычным символом.
+                              У неё нет специального значения.
                             </listitem>
                         </itemizedlist>
                     </para>
                     <para>
-                      Внутри открытой сессии эти данные могут быть получены  виде раздельных строк с помощью <link linkend="sciargs">sciargs()</link>.
+                      Внутри открытой сессии эти данные могут быть получены  виде раздельных
+                      строк с помощью <link linkend="sciargs">sciargs()</link>.
                      </para>
                      <para>
                       Пример:
-                        <screen><![CDATA[C:\Users\Me> scilex -nb -noatomsautoload -args "Привет, \"%USERNAME%\"" 1.2345 \"%cd%\"]]></screen>
+                        <screen><![CDATA[C:\Users\Me> C:\SCIdir\bin\scilab -nw -nb -noatomsautoload -args "Привет, %USERNAME%" 1.2345 \"%cd%\"]]></screen>
                         <programlisting><![CDATA[
 // Внутри открытой сессии:
 a = sciargs()
@@ -57,7 +125,13 @@ evstr(a(i+2))*2
 --> // Внутри открытой сессии:
 --> a = sciargs()
  a  =
-!c:\SCIdir\bin\scilex  -nw  -nb  -noatomsautoload  -args  Привет, "Иван"  1.2345  "C:\Users\Me" !
+! c:\SCIdir\bin\WScilex-cli.exe !
+! -nb                           !
+! -noatomsautoload              !
+! -args                         !
+! Привет, Иван                  !
+! 1.2345                        !
+! "C:\Users\Me"                 !
 
 --> i = find(a=="-args")
  i  =
@@ -65,7 +139,7 @@ evstr(a(i+2))*2
 
 --> a(i+1)
  ans  =
- Привет, "Иван"
+ Привет, Иван
 
 --> evstr(a(i+2))*2
  ans  =
@@ -76,9 +150,16 @@ evstr(a(i+2))*2
  Эта сессия была запущена из "C:\Users\Me"
 ]]></screen>
                      </para>
+                    <para>
+                      Заметим здесь, что <literal>>scilab -nw</literal> переведена в <literal>Wscilex-cli.exe</literal>
+                      с помощью пакетного файла <literal>scilab</literal>, таким образом, что опция
+                      "-nw" не возвращается с помощью <literal>sciargs()</literal>
+                      (смотри ниже).
+                    </para>
                      <para>
                      <note>
-                       Безопаснее использовать <literal>-args</literal> в качестве <emphasis role="italic">последней</emphasis> опции командной строки.
+                       Безопаснее использовать <literal>-args</literal> в качестве
+                       <emphasis role="italic">последней</emphasis> опции командной строки.
                      </note>
                      </para>
                 </listitem>
@@ -103,13 +184,16 @@ evstr(a(i+2))*2
                         <itemizedlist>
                             <listitem>
                                 <para>
-                                  устанавливает текущий рабочий каталог в каталог оболочки, из которой Scilab был запущен.
-                                  Пожалуйста, смотрите пример, приведенный здесь ниже для опции <literal>-f</literal>. Затем,
+                                  устанавливает текущий рабочий каталог в каталог оболочки,
+                                  из которой Scilab был запущен.
+                                  Пожалуйста, смотрите пример, приведенный здесь ниже для опции
+                                  <literal>-f</literal>. Затем,
                                 </para>
                             </listitem>
                             <listitem>
-                                <para>эта опция выполняет инструкции Scilab <literal>Instructions</literal>, указанные в строке. Пример :
-                                    <screen><![CDATA[ scilab-cli -e  "disp(\"Привет\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
+                                <para>эта опция выполняет инструкции Scilab
+                                <literal>Instructions</literal>, указанные в строке. Пример :
+                                    <screen><![CDATA[OS> scilab -nw -e  "disp(\"Привет\"); a=%pi+%i; disp(exp(a)); exit;" -nb]]></screen>
                                 </para>
                             </listitem>
                         </itemizedlist>
@@ -123,21 +207,25 @@ evstr(a(i+2))*2
                 <term>-f file</term>
                 <listitem>
                     <para>
-                        Если эта опцпия используется, то в начале сессии Scilab, после исполнения файлов запуска Sciblab и
-                        пользовательских файлов запуска, и после установки пользовательских настроек, включая настройки рабочей директории,
+                        Если эта опцпия используется, то в начале сессии Scilab,
+                        после исполнения файлов запуска Sciblab и пользовательских файлов запуска,
+                        и после установки пользовательских настроек, включая настройки рабочей
+                        директории,
                         <itemizedlist>
                             <listitem>
                                 <para>
-                                    текущая рабочая директория Scilab  устаровлена в каталоге оболочки, из которой Scilab был запущен. Например,
-                                    <screen><![CDATA[ D:\users\me\scilab\dev> C:\scilab-5.5.2\bin\scilex -f ..\test.sce]]></screen>
+                                    текущая рабочая директория Scilab устаровлена в каталоге
+                                    оболочки, из которой Scilab был запущен. Например,
+                                    <screen><![CDATA[ D:\users\me\scilab\dev> C:\SCIdir\bin\scilab -f ..\test.sce]]></screen>
                                     будет исполнять <literal>cd("D:\users\me\scilab\dev")</literal>.
                                 </para>
                             </listitem>
                             <listitem>
                                 <para>
-                                    Scilab-сценарий <literal>file</literal> выполнен. Если относительный путь используется
-                                    (по умолчанию <literal>.\</literal> или как <literal>..\</literal> в примере выше), то
-                                    он отсылается в новую рабочую директорию Scilab.
+                                    Scilab-сценарий <literal>file</literal> выполнен. Если
+                                    относительный путь используется (по умолчанию
+                                    <literal>.\</literal> или как <literal>..\</literal> в примере
+                                    выше), то он отсылается в новую рабочую директорию Scilab.
                                 </para>
                             </listitem>
                         </itemizedlist>
@@ -149,11 +237,12 @@ evstr(a(i+2))*2
                 <term>-quit</term>
                 <listitem>
                     <para>
-                        Эта опция заставляет Scilab всегда выходить после инструкций, переданных вместе с опцией
-                        <literal>-e</literal>, или  сценарий, на который ссылается оция <literal>-f</literal>,
-                        будет исполнен, даже в случае ошибки времени исполнения. Эта опция всегда должна использоваться
-                        в режиме пакетной обработки. Она игнорируется, если нет ни опции <literal>-e</literal>
-                        ни опции <literal>-f</literal>.
+                        Эта опция заставляет Scilab всегда выходить после инструкций,
+                        переданных вместе с опцией <literal>-e</literal>, или  сценарий,
+                        на который ссылается оция <literal>-f</literal>, будет исполнен,
+                        даже в случае ошибки времени исполнения. Эта опция всегда должна
+                        использоваться в режиме пакетной обработки. Она игнорируется,
+                        если нет ни опции <literal>-e</literal> ни опции <literal>-f</literal>.
                     </para>
                 </listitem>
             </varlistentry>
@@ -165,28 +254,32 @@ evstr(a(i+2))*2
                         <emphasis>lang</emphasis> может быть: <emphasis>ca_ES de_DE en_US es_ES
                             fr_FR ja_JP pt_BR ru_RU zh_CN zh_TW
                         </emphasis>
-                        (начиная с Scilab 5.2).
                     </para>
                     <para>
-                        Другими возможными значениями <literal>lang</literal> (для совместимости) являются <literal>'fr'</literal>
-                        для французского и <literal>'en'</literal> для английского языка. По умолчанию язык английский.
-                        Это значение по умолчанию зафиксировано в файле <literal>scilab.start</literal>.
+                        Другими возможными значениями <literal>lang</literal> (для совместимости)
+                        являются <literal>'fr'</literal>
+                        для французского и <literal>'en'</literal> для английского языка,
+                        или <literal>'pt'</literal> для бразильского португальского.
+                        По умолчанию язык английский.
                     </para>
+                    <note>
+                        В Windows в режимах "-nw" или "-nwni" выбранный шрифт терминала должен
+                        быть TrueType для поддержки символов UTF-8, например 
+                        <emphasis>Monospaced</emphasis> (лучший выбор, если доступен), или
+                        <emphasis>Consolas</emphasis> или <emphasis>Lucida Console</emphasis>.
+                    </note>
                     <para>
-                        В некоторых системах для правильного отображения шрифтов в кодировке UTF-8 локали должны быть откомпилированы.
+                        В некоторых системах для правильного отображения шрифтов в кодировке UTF-8
+                        локали должны быть откомпилированы.
                     </para>
-                    <para>Scilab также может быть запущен следующим образом:</para>
-                    <screen><![CDATA[ LANG=ja_JP scilab
- #  то же, что и
- scilab -l ja_JP
-]]></screen>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>-nb</term>
                 <listitem>
                     <para>
-                        "no banner" : Если есть эта опция, то сообщение о загрузке Scilab'а не будет отображаться.
+                        "no banner" : Если есть эта опция, то сообщение о загрузке Scilab'а не
+                        будет отображаться.
                     </para>
                 </listitem>
             </varlistentry>
@@ -195,11 +288,13 @@ evstr(a(i+2))*2
                 <listitem>
                     <para>
                         "No Startup files" :
-                        Если есть эта опция, то файл запуска <literal>SCI/etc/scilab.start</literal> и пользовательские
-                        файлы запуска <literal>SCIHOME/.scilab</literal> и <literal>SCIHOME/scilab.ini</literal> не исполняются.
+                        Если есть эта опция, то файл запуска <literal>SCI/etc/scilab.start</literal>
+                        и пользовательские файлы запуска <literal>SCIHOME/.scilab</literal> и
+                        <literal>SCIHOME/scilab.ini</literal> не исполняются.
                     </para>
                     <para>
-                        Эта опция отключит многие возможности Scilab'а (используйте, если вы знаете что делаете).
+                        Эта опция отключит многие возможности Scilab'а (используйте,
+                        если вы знаете что делаете).
                     </para>
                 </listitem>
             </varlistentry>
@@ -207,7 +302,8 @@ evstr(a(i+2))*2
                 <term>-nouserstartup</term>
                 <listitem>
                     <para>
-                        Если есть эта опция, то пользовательские файлы запуска <literal>SCIHOME/.scilab</literal> и
+                        Если есть эта опция, то пользовательские файлы запуска
+                        <literal>SCIHOME/.scilab</literal> и
                         <literal>SCIHOME/scilab.ini</literal> не исполняются.
                     </para>
                 </listitem>
@@ -216,7 +312,8 @@ evstr(a(i+2))*2
                 <term>-noatomsautoload</term>
                 <listitem>
                     <para>
-                        Если есть эта опция, то ранее установленные модули ATOMS не загружаются для данной сессии.
+                        Если есть эта опция, то ранее установленные модули ATOMS не загружаются
+                        для данной сессии.
                     </para>
                 </listitem>
             </varlistentry>
@@ -224,30 +321,24 @@ evstr(a(i+2))*2
                 <term>-nw</term>
                 <listitem>
                     <para>
-                        Если есть эта опция,то Scilab запускается как командная строка с улучшенными возможностями (графические окна, экспорт, xcos, scinotes, справочная система, ...).
+                        Если есть эта опция,то Scilab запускается как командная строка с
+                        улучшенными возможностями (графические окна, экспорт, xcos, scinotes,
+                        справочная система, ...).
                     </para>
                     <para>
-                        Начиная с Scilab 5.2:
-                        <itemizedlist>
-                            <listitem>
-                                <para>
-                                    конвейеры доступны во всех операционных системах (см. примеры для дополнительной
-                                    информации).
-                                </para>
-                            </listitem>
-                            <listitem>
-                                <para>
-                                    Дистрибутив Scilab также предоставляет специальный бинарный файл, который
-                                    делает то же, что и <literal>-nw</literal>:
-                                    <listitem>
-                                        Windows: <literal>WScilex-cli.exe</literal>.
-                                    </listitem>
-                                    <listitem>
-                                        <literal>scilab-adv-cli</literal> (Интерпретатор Scilab с улучшенной командной строкой).
-                                    </listitem>
-                                </para>
-                            </listitem>
-                        </itemizedlist>
+                        конвейеры доступны во всех операционных системах (см. примеры для
+                        дополнительной информации).
+                    </para>
+                    <para>
+                        Дистрибутив Scilab также предоставляет специальный бинарный файл, который
+                        делает то же, что и <literal>-nw</literal>:
+                        <listitem>
+                            Windows: <literal>WScilex-cli.exe</literal>.
+                        </listitem>
+                        <listitem>
+                            Linux и MacOS: <literal>scilab-adv-cli</literal>
+                            (Интерпретатор Scilab с улучшенной командной строкой).
+                        </listitem>
                     </para>
                 </listitem>
             </varlistentry>
@@ -255,34 +346,29 @@ evstr(a(i+2))*2
                 <term>-nwni / -nogui</term>
                 <listitem>
                     <important>
-                        Этот режим не загружает виртуальную машину Java (быстрее загружается и использует меньше памяти).
+                        Этот режим не загружает виртуальную машину Java (быстрее загружается и
+                        использует меньше памяти).
                     </important>
                     <warning>
-                        Если есть эта опция, то Scilab запускается как командная строка без улучшенных возможностей (графических окон, экспорта, xcos, scinotes, справочной системы, ...).
+                        Если есть эта опция, то Scilab запускается как командная строка без
+                        улучшенных возможностей (графических окон, экспорта, xcos, scinotes,
+                        справочной системы, ...).
                     </warning>
                     <para>
-                        Начиная с Scilab 5.2:
+                      конвейеры доступны во всех операционных системах (см. примеры для дополнительной
+                      информации).
+                    </para>
+                    <para>
+                        Дистрибутив Scilab также предоставляет специальный бинарный файл, который
+                        делает то же, что и <literal>-nwni</literal>:
                         <itemizedlist>
-                          <listitem>
-                            <para>
-                              конвейеры доступны во всех операционных системах (см. примеры для дополнительной
-                              информации).
-                            </para>
-                          </listitem>
-                          <listitem>
-                            <para>
-                                  Дистрибутив Scilab также предоставляет специальный бинарный файл, который
-                                  делает то же, что и <literal>-nwni</literal>: 
-                            <itemizedlist>
-                                <listitem>
-                                    Windows: <literal>Scilex.exe</literal>.
-                                </listitem>
-                                <listitem>
-                                    Others: <literal>scilab-cli</literal> (Интерпретатор Scilab с улучшенной командной строкой).
-                                </listitem>
-                            </itemizedlist>
-                            </para>
-                          </listitem>
+                            <listitem>
+                                Windows: <literal>Scilex.exe</literal>.
+                            </listitem>
+                            <listitem>
+                                Другие: <literal>scilab-cli</literal> (Интерпретатор Scilab с
+                                улучшенной командной строкой).
+                            </listitem>
                         </itemizedlist>
                     </para>
                 </listitem>
@@ -290,28 +376,44 @@ evstr(a(i+2))*2
             <varlistentry>
                 <term>-scihome dir</term>
                 <listitem>
-                    <para>Forces SCIHOME to the <literal>dir</literal> directory. If the path
-                      includes some white space, it must be specified between double-quotes (no
-                      single quotes!).
-                      if <literal>dir</literal> is a relative path, <literal>dir</literal> is add to parent standard SCIHOME folder.
-                      On Windows: %USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal>
-                      On Linux/MacOS: ~/.Scilab/<literal>dir</literal>
+                    <para>
+                        Переключает SCIHOME в директорию <literal>dir</literal>. Если путь
+                        содержит пробелы, то он должен быть заключён в двойные кавычки (не 
+                        одинарные!).
+                        Если <literal>dir</literal> является относительным путём, то 
+                        <literal>dir</literal> добавляется к родительской стандартной папке 
+                        SCIHOME.
+                        <table>
+                            <tr><td>В Windows: </td>
+                                <td>%USERPROFILE%\AppData\Roaming\Scilab\<literal>dir</literal></td>
+                            </tr>
+                            <tr><td>В Linux/MacOS:</td>
+                                <td>~/.Scilab/<literal>dir</literal></td>
+                            </tr>
+                        </table>
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>--texmacs</term>
                 <listitem>
-                    <para>Эта опция предназначена для TeXMacs.</para>
-                    <para>Пожалуйста, установите ATOMS-модуль TeXMacs:
-                        <code>atomsInstall('texmacs')</code>
+                    <para>
+                        Эта опция используется, когда Scilab используется в качестве
+                        вычислительного интерфейса внутри научного редактора <ulink url="http://texmacs.org">TeXmacs</ulink>,
+                        используя ATOMS-модуль
+                        <ulink url="https://atoms.scilab.org/toolboxes/texmacs">TeXmacs</ulink>.
+                        Этот модуль может быть предварительно установлен в Scilab с помощью
+                        <code>atomsInstall('texmacs')</code>.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>-version</term>
                 <listitem>
-                    <para>Эта опция выводит на экран версию продукта.</para>
+                    <para>
+                        Эта опция отображает версию продукта в терминале.
+                        Сессия Scilab не открывается.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -425,20 +527,7 @@ evstr(a(i+2))*2
             важным править опции JVM (Виртуальная Машина Java).
         </para>
         <para>
-            Эти опции доступны в файле <emphasis>jvm_options.xml</emphasis>.
-        </para>
-        <para>
-            В версиях 5.0.X и 5.1.X этот файл хранится как
-            <emphasis>SCI/modules/jvm/etc/jvm_options.xml</emphasis>.
-        </para>
-        <para>
-            В версии &gt;= 5.2.0 этот файл доступен в
-            <emphasis>
-                etc/jvm_options.xml
-            </emphasis>
-            .
-        </para>
-        <para>
+            Эти опции доступны в файле <emphasis>SCI/etc/jvm_options.xml</emphasis>.
             <emphasis>
                 По умолчанию в конфигурационном файле легко доступны следующие три опции:
             </emphasis>
@@ -448,10 +537,11 @@ evstr(a(i+2))*2
                 <term>-XmxXXXm</term>
                 <listitem>
                     <para>
-                        Эта опция устанавливает количество памяти, доступной для виртуальной Java-машины. По умолчанию выделено 256 МБ. Если вы меняете это значение, убедитесь, что оно не превышает память системы.
+                        Эта опция устанавливает количество памяти, доступной для виртуальной Java-машины.
+                        По умолчанию выделено 256 МБ. Если вы меняете это значение, убедитесь, что оно не превышает память системы.
                     </para>
                     <para>
-                        Начиная с Scilab 5.4.0, это значение можно менять в меню настроек.
+                        Это значение можно менять в меню настроек.
                     </para>
                 </listitem>
             </varlistentry>
@@ -477,7 +567,7 @@ evstr(a(i+2))*2
         </variablelist>
         <para>
             Доступно очень много опций. Они могут улучшить производительность, поменять взгляды и
-            отношение, изменить способы управления памятью... Смотрите:: <ulink url="http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp">http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp</ulink>
+            отношение, изменить способы управления памятью... Смотрите: <ulink url="http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp">http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp</ulink>
             или <ulink url="http://blogs.sun.com/watt/resource/jvm-options-list.html">http://blogs.sun.com/watt/resource/jvm-options-list.html</ulink>.
         </para>
     </refsection>
@@ -541,14 +631,27 @@ echo $? ]]></screen>
             <member>
                 <link linkend="exit">exit</link>
             </member>
+            <member>
+                <link linkend="preferences">preferences</link>
+            </member>
+            <member>
+                <ulink url="http://texmacs.org/">TeXmacs</ulink>
+            </member>
         </simplelist>
     </refsection>
     <refsection role="history">
         <title>История</title>
         <revhistory>
             <revision>
+                <revnumber>5.2.0</revnumber>
+                <revremark>Реализована конвейеризация. Добавлена опция -l lang</revremark>
+            </revision>
+            <revision>
                 <revnumber>5.4.0</revnumber>
-                <revremark>добавлено -noatomsautoload.</revremark>
+                <revremark>
+                    добавлено -noatomsautoload.
+                    Динамическая память Java может быть установлена в настройках.
+                </revremark>
             </revision>
             <revision>
                 <revnumber>5.4.1</revnumber>
@@ -560,13 +663,41 @@ echo $? ]]></screen>
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    Добавлена опция <literal>-quit</literal>. Опция <literal>-mem</literal> удалена.
-                </revremark>
+                    <itemizedlist>
+                        <listitem>
+                            Пользовательские опции:
+                            <itemizedlist>
+                                <listitem>
+                                    Добавлены: <literal>--help</literal>, <literal>-quit</literal>
+                                </listitem>
+                                <listitem>
+                                    Удалены: <literal>-mem</literal>
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                        <listitem>
+                            Добавлены опции разработчика:
+                            <itemizedlist>
+                                <listitem>
+                                    <literal>--parse-trace</literal>, <literal>--AST-trace</literal>,
+                                    <literal>--pretty-print</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--AST-timed</literal>, <literal>--timed</literal>
+                                </listitem>
+                                <listitem>
+                                    <literal>--no-exec</literal>, <literal>--exec-verbose</literal>,
+                                    <literal>--timeout delay</literal>, <literal>--context-dump</literal>.
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                    </itemizedlist>
+               </revremark>
             </revision>
             <revision>
                 <revnumber>6.0.1</revnumber>
                 <revremark>
-                    <literal>-scihome</literal> option added.
+                    Добавлена опция <literal>-scihome</literal>.
                 </revremark>
             </revision>
         </revhistory>