[doc][core] Unfold synopses (end, after d9e34a) 33/21733/5
Samuel GOUGEON [Fri, 16 Apr 2021 20:58:09 +0000 (22:58 +0200)]
  + other small fix or improvements

Change-Id: I32aeab85504634bbfa2c96772fa078490815d797

85 files changed:
scilab/modules/core/help/en_US/configuration/banner.xml
scilab/modules/core/help/en_US/configuration/getdebuginfo.xml
scilab/modules/core/help/en_US/configuration/getmemory.xml
scilab/modules/core/help/en_US/configuration/getmodules.xml
scilab/modules/core/help/en_US/configuration/getos.xml
scilab/modules/core/help/en_US/configuration/getscilabmode.xml
scilab/modules/core/help/en_US/configuration/getshell.xml
scilab/modules/core/help/en_US/configuration/getversion.xml
scilab/modules/core/help/en_US/configuration/ver.xml
scilab/modules/core/help/en_US/configuration/with_module.xml
scilab/modules/core/help/en_US/error_handling/lasterror.xml
scilab/modules/core/help/en_US/startup.xml
scilab/modules/core/help/en_US/types/typename.xml
scilab/modules/core/help/en_US/variables/exists.xml
scilab/modules/core/help/en_US/variables/isdef.xml
scilab/modules/core/help/en_US/variables/who.xml
scilab/modules/core/help/en_US/variables/who_user.xml
scilab/modules/core/help/fr_FR/configuration/banner.xml
scilab/modules/core/help/fr_FR/configuration/getos.xml
scilab/modules/core/help/fr_FR/configuration/getshell.xml
scilab/modules/core/help/fr_FR/configuration/with_macros_source.xml
scilab/modules/core/help/fr_FR/debugging/where.xml
scilab/modules/core/help/fr_FR/startup.xml
scilab/modules/core/help/fr_FR/types/typename.xml
scilab/modules/core/help/fr_FR/variables/exists.xml
scilab/modules/core/help/fr_FR/variables/isdef.xml
scilab/modules/core/help/fr_FR/variables/who.xml
scilab/modules/core/help/ja_JP/configuration/banner.xml
scilab/modules/core/help/ja_JP/configuration/getdebuginfo.xml
scilab/modules/core/help/ja_JP/configuration/getmodules.xml
scilab/modules/core/help/ja_JP/configuration/getos.xml
scilab/modules/core/help/ja_JP/configuration/getscilabmode.xml
scilab/modules/core/help/ja_JP/configuration/getshell.xml
scilab/modules/core/help/ja_JP/configuration/getversion.xml
scilab/modules/core/help/ja_JP/configuration/ver.xml
scilab/modules/core/help/ja_JP/configuration/with_javasci.xml
scilab/modules/core/help/ja_JP/error_handling/lasterror.xml
scilab/modules/core/help/ja_JP/startup.xml
scilab/modules/core/help/ja_JP/types/type.xml
scilab/modules/core/help/ja_JP/types/typename.xml
scilab/modules/core/help/ja_JP/variables/exists.xml
scilab/modules/core/help/ja_JP/variables/global.xml
scilab/modules/core/help/ja_JP/variables/isdef.xml
scilab/modules/core/help/ja_JP/variables/who.xml
scilab/modules/core/help/ja_JP/variables/who_user.xml
scilab/modules/core/help/pt_BR/configuration/banner.xml
scilab/modules/core/help/pt_BR/configuration/getdebuginfo.xml
scilab/modules/core/help/pt_BR/configuration/getmodules.xml
scilab/modules/core/help/pt_BR/configuration/getos.xml
scilab/modules/core/help/pt_BR/configuration/getscilabmode.xml
scilab/modules/core/help/pt_BR/configuration/getshell.xml
scilab/modules/core/help/pt_BR/configuration/getversion.xml
scilab/modules/core/help/pt_BR/configuration/sciargs.xml
scilab/modules/core/help/pt_BR/configuration/ver.xml
scilab/modules/core/help/pt_BR/configuration/with_macros_source.xml
scilab/modules/core/help/pt_BR/configuration/with_module.xml
scilab/modules/core/help/pt_BR/debugging/where.xml
scilab/modules/core/help/pt_BR/debugging/whereami.xml
scilab/modules/core/help/pt_BR/error_handling/errclear.xml
scilab/modules/core/help/pt_BR/error_handling/lasterror.xml
scilab/modules/core/help/pt_BR/exit.xml [deleted file]
scilab/modules/core/help/pt_BR/startup.xml
scilab/modules/core/help/pt_BR/types/type.xml
scilab/modules/core/help/pt_BR/types/typename.xml
scilab/modules/core/help/pt_BR/variables/exists.xml
scilab/modules/core/help/pt_BR/variables/isdef.xml
scilab/modules/core/help/pt_BR/variables/predef.xml
scilab/modules/core/help/pt_BR/variables/who.xml
scilab/modules/core/help/pt_BR/variables/who_user.xml
scilab/modules/core/help/pt_BR/variables/whos.xml
scilab/modules/core/help/ru_RU/configuration/banner.xml
scilab/modules/core/help/ru_RU/configuration/getdebuginfo.xml
scilab/modules/core/help/ru_RU/configuration/getmodules.xml
scilab/modules/core/help/ru_RU/configuration/getos.xml
scilab/modules/core/help/ru_RU/configuration/getscilabmode.xml
scilab/modules/core/help/ru_RU/configuration/getshell.xml
scilab/modules/core/help/ru_RU/configuration/getversion.xml
scilab/modules/core/help/ru_RU/configuration/ver.xml
scilab/modules/core/help/ru_RU/error_handling/lasterror.xml
scilab/modules/core/help/ru_RU/startup.xml
scilab/modules/core/help/ru_RU/types/typename.xml
scilab/modules/core/help/ru_RU/variables/exists.xml
scilab/modules/core/help/ru_RU/variables/isdef.xml
scilab/modules/core/help/ru_RU/variables/who.xml
scilab/modules/core/help/ru_RU/variables/who_user.xml

index c38ac43..96dde1c 100644 (file)
     <refsection>
         <title>Description</title>
         <para>
-            <literal>banner</literal> shows Scilab banner.
+            <literal>banner</literal> shows Scilab's banner.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-clc();banner()
- ]]></programlisting>
+clc, banner()
+     ]]></programlisting>
+        <screen><![CDATA[
+        ___________________________________________
+                     scilab-6.1.0
+
+                        ESI Group
+           Copyright (c) 2017-2021 (ESI Group)
+       Copyright (c) 2011-2017 (Scilab Enterprises)
+             Copyright (c) 1989-2012 (INRIA)
+              Copyright (c) 1989-2007 (ENPC)
+        ___________________________________________
+]]></screen>
     </refsection>
 </refentry>
index eeecfb1..2d5d41b 100644 (file)
@@ -6,9 +6,8 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>getdebuginfo()
-            dynamic_info = getdebuginfo();
-            [dynamic_info, static_info] = getdebuginfo();
+        <synopsis>
+            [dynamic_info, static_info] = getdebuginfo()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             system.
         </para>
         <para>
-            <code>[dynamic_info,static_info] = getdebuginfo();</code> returns information
+            <literal>[dynamic_info, static_info] = getdebuginfo()</literal> returns information
             about your system and about Scilab.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-[a,b]=getdebuginfo()
- ]]></programlisting>
-    </refsection>
+[a, b] = getdebuginfo()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> [a, b] = getdebuginfo()
+ a  =
+  "Memory in use:      31 %"
+  "Total Physical Memory (Kbytes): 16618008"
+  "Free Physical Memory (Kbytes): 11381360"
+  "Total Paging File (Kbytes): 19108376"
+  "Free Paging File (Kbytes): 10309008"
+  "Total Virtual Memory (Kbytes): 137438953344"
+  "Free Virtual Memory (Kbytes): 137430188892"
+  "Free Extended Memory (Kbytes):       0"
+  "Operating System: Windows 8 x64"
+  "Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz"
+  "Number of processors: 12"
+  "Number of Video cards: 2"
+  "Video card #0: Intel(R) UHD Graphics 630"
+  "Video card #1: NVIDIA GeForce GTX 1660 Ti"
+  "Primary Video card driver version: 27.20.100.8681"
+  "Screen size: 1920 x 1080 32 bits"
+  "Number of Monitors: 1"
+  "Path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;..."
+  "ComSpec: C:\WINDOWS\system32\cmd.exe"
+  "TMP : C:\Users\me\AppData\Local\Temp"
+  "TEMP: C:\Users\me\AppData\Local\Temp"
 
+ b  =
+  "Version: scilab-6.1.0"
+  "Compilation date: Feb 25 2020"
+  "Compilation time: 11:34:32"
+  "Compiler Architecture: X64"
+  "Compiled with Microsoft compiler (191627035)"
+  "BLAS library optimized version: MKL"
+  "XML version: 2.9.1"
+  "Tcl/Tk: Enable"
+  "TCL version: 8.5.9"
+  "TK version: 8.5.9"
+  "Path separator: ;"
+  "Directory separator: \"
+  "PCRE Version: 8.21"
+]]></screen>
+    </refsection>
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
index bbbb4a6..2c6b983 100644 (file)
@@ -9,7 +9,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[free, total]=getmemory()</synopsis>
+        <synopsis>[free, total] = getmemory()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Description</title>
index 08e5937..23dd78c 100644 (file)
@@ -2,13 +2,12 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="getmodules">
     <refnamediv>
         <refname>getmodules</refname>
-        <refpurpose>returns list of modules installed in
-            Scilab
+        <refpurpose>lists modules installed in Scilab
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>res=getmodules()</synopsis>
+        <synopsis>res = getmodules()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
             <varlistentry>
                 <term>res</term>
                 <listitem>
-                    <para>a string matrix</para>
+                    <para>a column of strings: names of modules installed in Scilab.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Description</title>
-        <para>Returns list of modules installed in Scilab.</para>
-    </refsection>
-    <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-modules=getmodules();
+modules = getmodules();
 find(modules=="core");
 with_module("core");
  ]]></programlisting>
index 92dfcfb..ca6f0dc 100644 (file)
@@ -9,8 +9,7 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            OS=getos()
-            [OS,Version]=getos()
+            [OS, Version] = getos()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-OS=getos()
-[OS,version] = getos()
+OS = getos()
+[OS, version] = getos()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> OS = getos()
+ OS  =
+  "Windows"
+
+--> [OS, version] = getos()
+ OS  =
+  "Windows"
+
+ version  =
+  "8 x64"
+]]></screen>
+        <programlisting role="example"><![CDATA[
 if (getos() == "Windows") then
    disp("Scilab on Windows");
 end
@@ -36,7 +49,6 @@ end
 if (getos() == "Darwin") then
    disp("Scilab on MacOs");
 end
-
- ]]></programlisting>
+     ]]></programlisting>
     </refsection>
 </refentry>
index 688e25e..ca854bb 100644 (file)
     </refsynopsisdiv>
     <refsection>
         <title>Description</title>
-        <para>Returns scilab mode. 4 modes are possible: STD, API, NW, NWNI.</para>
+        <para>Returns scilab mode. 4 modes are possible: "STD", "API", "NW", "NWNI".</para>
         <para>
-            <literal>API</literal>: Scilab is launch as an API.
+            <literal>"API"</literal>: Scilab is launch as an API.
         </para>
         <para>
-            <literal>STD</literal>: the standard Scilab (gui, plot ...).
+            <literal>"STD"</literal>: the standard Scilab (gui, plot ...).
         </para>
         <para>
-            <literal>NW</literal>: Scilab in command line with the plots.
+            <literal>"NW"</literal>: Scilab in command line with the plots.
         </para>
         <para>
-            <literal>NWNI</literal>: Scilab in command line without any graphics.
+            <literal>"NWNI"</literal>: Scilab in command line without any graphics.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 getscilabmode()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getscilabmode()
+ ans  =
+  "STD"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index 4835482..b64bee8 100644 (file)
@@ -2,8 +2,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="getshell">
     <refnamediv>
         <refname>getshell</refname>
-        <refpurpose>returns current command
-            interpreter.
+        <refpurpose>returns current command interpreter
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 getshell()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getshell()
+ ans  =
+  "cmd"
+]]></screen>
     </refsection>
 </refentry>
index 6aae79b..a417e6b 100644 (file)
@@ -6,12 +6,12 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>version = getversion()
-            [version, opts] = getversion()
+        <synopsis>
+            [version, options] = getversion()
+            [COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
             version_numbers = getversion('scilab')
-            versioninfo = getversion('scilab', 'string_info')
             version_numbers = getversion('&lt;module&gt;')
-            versioninfo = getversion('&lt;module&gt;','string_info')
+            version = getversion('&lt;module&gt;','string_info')
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <varlistentry>
                 <term>version</term>
                 <listitem>
-                    <para>a string</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>versioninfo</term>
-                <listitem>
-                    <para>a string about version</para>
+                    <para>a string about version. Example: "scilab-6.1.0"</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>version_numbers</term>
                 <listitem>
                     <para>an integer vector</para>
-                    <para>ver(1) Major version</para>
-                    <para>ver(2) Minor version</para>
-                    <para>ver(3) Maintenance version</para>
-                    <para>ver(4) GIT timestamp</para>
+                    <para>version_numbers(1) Major version</para>
+                    <para>version_numbers(2) Minor version</para>
+                    <para>version_numbers(3) Maintenance version</para>
+                    <para>version_numbers(4) GIT timestamp</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>opts</term>
+                <term>options</term>
                 <listitem>
                     <para>
                         a vector of string: <literal>[compiler, architecture,[tk, modelicac, ] release_mode, release_date, release_time]</literal>
@@ -52,8 +46,8 @@
     <refsection>
         <title>Description</title>
         <para>
-            <literal>[version, opts] = getversion()</literal> returns in <literal>version</literal> the Scilab version name and in
-            <literal>opts</literal> build options which can be used to determine if
+            <literal>[version, options] = getversion()</literal> returns in <literal>version</literal> the Scilab version name and in
+            <literal>options</literal> build options which can be used to determine if
             scilab has been build with tk or modelicac and gives release date and time.
         </para>
         <para> [tk, modelicac, atlas,] are optional. </para>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 getversion()
+[version, options] = getversion()
+[COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
+or(options == 'modelicac')
+or(options == 'tk')
 
-[version, opts] = getversion()
-COMPILER = opts(1)
-ARCH = opts(2)
-or(opts == 'modelicac')
-or(opts == 'tk')
-RELEASE_MODE = opts($-2)
-RELEASE_DATE = opts($-1)
-RELEASE_TIME = opts($)
-
-version = getversion('scilab')
-versionstr = getversion('scilab','string_info')
-version = getversion('overloading')
-versionstr = getversion('overloading','string_info')
-
+numbers = getversion('scilab')
+version = getversion('scilab','string_info')
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 2f90c22..1d16aa6 100644 (file)
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
 r = ver()
- ]]></programlisting>
+     ]]></programlisting>
+           <screen><![CDATA[
+--> r = ver()
+ r  =
+  "Scilab Version: "                    "6.1.1.0"                                                         
+  "Operating System: "                  "Windows 10 10.0"                                                 
+  "Java version: "                      "1.8.0_151"                                                       
+  "Java runtime information: "          "Java(TM) SE Runtime Environment (build 1.8.0_151-b12)"           
+  "Java Virtual Machine information: "  "Java HotSpot(TM) 64-Bit Server VM (build 25.151-b12, mixed mode)"
+  "Vendor specification: "              "Oracle Corporation"                                              
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index edbb3c2..edb6513 100644 (file)
@@ -44,7 +44,7 @@ if withXML == %t then
 else
    disp("XML module disabled");
 end
- ]]></programlisting>
+     ]]></programlisting>
     </refsection>
 
     <refsection role="see also">
index eaf8c1d..5502ca5 100644 (file)
@@ -6,9 +6,9 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>str=lasterror( [opt] )
-            [str,n]=lasterror([opt])
-            [str,n,line,func]=lasterror([opt])
+        <synopsis>
+            [str,n,line,func] = lasterror()
+            [str,n,line,func] = lasterror(opt)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 62b3043..c64dac0 100644 (file)
             present) when Scilab is invoked, in addition with the file
             <link linkend="SCI">SCI</link>/etc/scilab.start.
         </para>
-    </refsection>
-    <refsection>
-        <title>Remarks</title>
-        <para>Last line of startup file must be terminated by a newline to be
-            taken into account.
-        </para>
+        <warning>
+            <para>The last instruction of a startup file must be followed by a newline to be
+                taken into account.
+            </para>
+        </warning>
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -29,7 +28,7 @@ ls(SCIHOME)
 if ls(SCIHOME+"/scilab.ini") == [] & ls(SCIHOME+"/.scilab") == []
    disp("No startup file defined");
 end
- ]]></programlisting>
+     ]]></programlisting>
     </refsection>
 
     <refsection role="see also">
index 9f9901e..7ef53c8 100644 (file)
@@ -6,22 +6,22 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[types [ [,names]]=typename()
+        <synopsis>[indices, onames] = typename()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>types</term>
+                <term>indices</term>
                 <listitem>
                     <para>an integer column vector: the types codes of each defined data types.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>names</term>
+                <term>onames</term>
                 <listitem>
-                    <para>a column vector of strings: the names associated to type codes.</para>
+                    <para>a column vector of strings: overloading codes associated to types.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Description</title>
         <para>
-            The function and operator overloading make use of a formal name
-            associated to data types to form the name of the overloading function
-            (see <link linkend="overloading">overloading</link>). The <function>typename</function> can be used to handle this
-            formal names for hard coded data types (the <literal>tlist</literal> or <literal>mlist</literal>
-            coded data types formal names are defined in another way, see <link linkend="overloading">overloading</link>).
+            <function>typename</function> returns information on defined data types.
         </para>
         <para>
-            <function>typename</function> returns information on defined data types.
+            The function and operator overloading make use of a formal name
+            associated to data types to form the name of the overloading function
+            (see <link linkend="overloading">overloading</link>). The <function>typename</function>
+            can be used to handle this formal names for hard coded data types
+            (the <literal>tlist</literal> or <literal>mlist</literal> coded data types formal
+            names are defined in another way, see <link linkend="overloading">overloading</link>).
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-[typs,nams]=typename();
-disp("First type (double) : " + string(typs(1)) + " / " + nams(1));
-]]></programlisting>
+[ind, onames] = typename();
+mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+    ]]></programlisting>
+       <screen><![CDATA[
+--> mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+Type index:   1  overloading code: "s"
+Type index:   2  overloading code: "p"
+Type index:   4  overloading code: "b"
+Type index:   5  overloading code: "sp"
+Type index:   6  overloading code: "spb"
+Type index:   7  overloading code: "msp"
+Type index:   8  overloading code: "i"
+Type index:   9  overloading code: "h"
+Type index:  10  overloading code: "c"
+Type index:  13  overloading code: "function"
+Type index:  14  overloading code: "f"
+Type index:  15  overloading code: "l"
+Type index:  16  overloading code: "tl"
+Type index:  17  overloading code: "ml"
+Type index: 128  overloading code: "ptr"
+Type index: 129  overloading code: "ip"
+Type index: 130  overloading code: "fptr"
+]]></screen>
     </refsection>
 
     <refsection role="see also">
index 02932d7..3328a39 100644 (file)
@@ -6,25 +6,18 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>ve = exists(name [,where])</synopsis>
+        <synopsis>
+            ve = exists(name)
+            ve = exists(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>ve</term>
-                <listitem>
-                    <para>
-                        a matrix with the same size as <varname>name</varname> with possible values:
-                        <literal>1</literal> if true,
-                        <literal>0</literal> if false
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>name</term>
                 <listitem>
-                    <para>a matrix of character strings</para>
+                    <para>matrix of character strings: names of queried variables.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>ve</term>
+                <listitem>
+                    <para>
+                        a matrix with the same size as <varname>name</varname> with possible values:
+                        <literal>1</literal> if true,
+                        <literal>0</literal> if false
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index a53c461..85be680 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>ve = isdef(name [,where])</synopsis>
+        <synopsis>
+            ve = isdef(name)
+            ve = isdef(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>ve</term>
-                <listitem>
-                    <para>
-                        a matrix with the same size as <varname>name</varname> with boolean values
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>name</term>
                 <listitem>
-                    <para>a matrix of character strings</para>
+                    <para>matrix of strings: names of queried variables.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>ve</term>
+                <listitem>
+                    <para>
+                        a matrix with the same size as <varname>name</varname> with boolean values
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index f6a1616..6499ace 100644 (file)
@@ -8,23 +8,25 @@
         <title>Syntax</title>
         <synopsis>who
             who()
-            [names, mem] = who([mode], [sorted])
+            [names, mem] = who(scope)
+            [names, mem] = who(scope, sorted)
+            [names, mem] = who(sorted)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>mode</term>
+                <term>scope</term>
                 <listitem>
                     <para>
-                        <literal>local</literal>/<literal>get</literal>: list visible variables (not only in current function).
+                        <literal>"local"</literal> or <literal>"get"</literal>: list visible variables (not only in current function).
                     </para>
                     <para>
-                        <literal>scope</literal>/<literal>current</literal>: list variables in the current scope/function.
+                        <literal>"scope"</literal> or <literal>"current"</literal>: list variables in the current scope/function.
                     </para>
                     <para>
-                        <literal>global</literal>: list global variables.
+                        <literal>"global"</literal>: list global variables.
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-a=1;
-b=2;
-[name, mem]=who("local");
-position=find(name=="a")
+[a, b] = (1, 2);
+[name, mem] = who("local");
+position = find(name=="a")
 mem(position) // Size used by a
-position=find(name=="d") // []
+position = find(name=="d") // []
 
 function foo(a,b)
     disp(who("scope", "sorted"))
 endfunction
-
 foo(1,2);
-
- ]]></programlisting>
+     ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
@@ -77,6 +76,9 @@ foo(1,2);
             <member>
                 <link linkend="who_user">who_user</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
         </simplelist>
     </refsection>
     <refsection role="history">
@@ -85,7 +87,7 @@ foo(1,2);
             <revision>
                 <revnumber>6.0.1</revnumber>
                 <revdescription>
-                    Add "scope" or "current" mode.
+                    Add "scope" or "current" scope.
                 </revdescription>
             </revision>
         </revhistory>
index cf4862d..a57b63d 100644 (file)
@@ -6,7 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>varList = who_user([bPrint])</synopsis>
+        <synopsis>
+            varList = who_user()
+            varList = who_user(bPrint)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
@@ -20,9 +23,6 @@
                 </listitem>
             </varlistentry>
         </variablelist>
-    </refsection>
-    <refsection>
-        <title>Return value</title>
         <variablelist>
             <varlistentry>
                 <term>varList</term>
@@ -43,7 +43,7 @@
     <refsection>
         <title>Examples</title>
         <programlisting role="code_scilab"><![CDATA[
-clear;
+clear
 who_user()
 who_user(%t)
 who_user(%f)
@@ -52,9 +52,7 @@ b = 2;
 who_user()
 who_user(%t)
 who_user(%f)
-clear;
- ]]>
-        </programlisting>
+      ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index dad9e99..fad6e98 100644 (file)
     <refsection>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-clc();banner()
- ]]></programlisting>
+clc, banner()
+     ]]></programlisting>
+        <screen><![CDATA[
+        ___________________________________________
+                     scilab-6.1.0
+
+                        ESI Group
+           Copyright (c) 2017-2021 (ESI Group)
+       Copyright (c) 2011-2017 (Scilab Enterprises)
+             Copyright (c) 1989-2012 (INRIA)
+              Copyright (c) 1989-2007 (ENPC)
+        ___________________________________________
+]]></screen>
     </refsection>
 </refentry>
index 2b90eaa..0a59c0d 100644 (file)
     <refsection>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-OS=getos()
-[OS,version] = getos()
+OS = getos()
+[OS, version] = getos()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> OS = getos()
+ OS  =
+  "Windows"
+
+--> [OS, version] = getos()
+ OS  =
+  "Windows"
+
+ version  =
+  "8 x64"
+]]></screen>
+        <programlisting role="example"><![CDATA[
 if (getos() == "Windows") then disp("Scilab on Windows"); end
 if (getos() == "Linux") then disp("Scilab on Linux"); end
 if (getos() == "SunOS") then disp("Scilab on Solaris"); end
index e0ad4fe..00d6c4a 100644 (file)
@@ -2,8 +2,8 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="getshell">
     <refnamediv>
         <refname>getshell</refname>
-        <refpurpose>retourne le nom de l'interpreteur de
-            commandes.
+        <refpurpose>
+            retourne le nom de l'interpreteur de commandes
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
 getshell()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getshell()
+ ans  =
+  "cmd"
+]]></screen>
     </refsection>
 </refentry>
index a1d6700..1357ec2 100644 (file)
@@ -6,7 +6,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>r=with_macros_source()</synopsis>
+        <synopsis>r = with_macros_source()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
index 1b715ee..c05159a 100644 (file)
@@ -9,7 +9,9 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>[linenum,mac]=where()</synopsis>
+        <synopsis>
+            [linenum, mac] = where()
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
index a58d875..490a090 100644 (file)
             (s'ils existent) au démarrage de Scilab, ainsi que le fichier
             <link linkend="SCI">SCI</link>/etc/scilab.start.
         </para>
-    </refsection>
-    <refsection>
-        <title>Remark</title>
-        <para>les fichiers de démarrage doivent obligatoirement comporter une
-            nouvelle ligne en fin de fichier pour être pris en compte.
-        </para>
+        <warning>
+            <para>la dernière ligne utile d'un fichier de démarrage doit obligatoirement être
+                suivie d'une ligne vide pour être prise en compte.
+            </para>
+        </warning>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
index 8ca588b..fe26c1c 100644 (file)
@@ -6,23 +6,26 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>[types [ [,names]]=typename()
+        <synopsis>
+            [indices, onames] = typename()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
-                <term>types  </term>
+                <term>indices</term>
                 <listitem>
                     <para>vecteur colonne d'entiers, les codes des types de variables
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>names  </term>
+                <term>onames</term>
                 <listitem>
-                    <para>vecteur colonne de chaînes de caractères, les noms associés à chaque code
+                    <para>
+                        vecteur colonne de chaînes de caractères : nom des codes de surcharge
+                        associés aux différents types de données.
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>Description</title>
         <para>
-            La surcharge des opérateurs et primitives utilise des noms formels associés à
-            chaque type de variable pour former les noms des fonctions de surcharge
-            (voir <literal>overloading</literal>). <literal>typename</literal> peut être utilisé pour gérer ces noms pour les types natifs de variables (les noms formels pour les types <literal>tlist</literal> ou <literal>mlist</literal> sont définis autrement, pour ceci voir <literal>overloading</literal>).
+            <literal>typename</literal> renvoie les informations associées aux types de données déjà définis.
         </para>
         <para>
-            <literal>typename</literal> renvoie les informations associées aux types de données déjà définis.
+            La surcharge des opérateurs et primitives utilise des noms formels associés à
+            chaque type de variable pour former les noms des fonctions de surcharge
+            (voir <literal>overloading</literal>). <literal>typename</literal> peut être utilisé
+            pour gérer ces noms pour les types natifs de variables (les noms formels pour les types
+            <literal>tlist</literal> ou <literal>mlist</literal> sont définis autrement.
+            Pour ceci, voir <link linkend="overloading">overloading</link>).
         </para>
     </refsection>
     <refsection>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-[typs,nams]=typename();
-disp("First type (double) : " + string(typs(1)) + " / " + nams(1));
-]]></programlisting>
+[ind, onames] = typename();
+mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+    ]]></programlisting>
+       <screen><![CDATA[
+--> mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+Type index:   1  overloading code: "s"
+Type index:   2  overloading code: "p"
+Type index:   4  overloading code: "b"
+Type index:   5  overloading code: "sp"
+Type index:   6  overloading code: "spb"
+Type index:   7  overloading code: "msp"
+Type index:   8  overloading code: "i"
+Type index:   9  overloading code: "h"
+Type index:  10  overloading code: "c"
+Type index:  13  overloading code: "function"
+Type index:  14  overloading code: "f"
+Type index:  15  overloading code: "l"
+Type index:  16  overloading code: "tl"
+Type index:  17  overloading code: "ml"
+Type index: 128  overloading code: "ptr"
+Type index: 129  overloading code: "ip"
+Type index: 130  overloading code: "fptr"
+]]></screen>
     </refsection>
 
     <refsection role="see also">
index 4491ddf..abd881f 100644 (file)
@@ -8,7 +8,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>ve = exists(name [,where])</synopsis>
+        <synopsis>
+            ve = exists(name)
+            ve = exists(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
index 9f3a128..5c01e91 100644 (file)
@@ -6,7 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>ve = isdef(name [,where])</synopsis>
+        <synopsis>
+            ve = isdef(name)
+            ve = isdef(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
index 9b4bfa5..cd5333a 100644 (file)
@@ -8,23 +8,27 @@
         <title>Séquence d'appel</title>
         <synopsis>who
             who()
-            [names, mem] = who([mode], [sorted])
-        </synopsis>
+            [names, mem] = who(scope)
+            [names, mem] = who(sorted)
+            [names, mem] = who(scope, sorted)
+       </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>mode</term>
+                <term>scope</term>
                 <listitem>
                     <para>
-                        <literal>local</literal>/<literal>get</literal>: liste les variables visibles (pas seulement dans la fonction courrante).
+                        <literal>"local"</literal> ou <literal>"get"</literal>: liste les variables
+                        visibles (pas seulement dans la fonction courrante).
                     </para>
                     <para>
-                        <literal>scope</literal>/<literal>current</literal>: liste les variables dans la fonction courrante.
+                        <literal>"scope"</literal> ou <literal>"current"</literal>: liste les variables
+                        dans la fonction courrante.
                     </para>
                     <para>
-                        <literal>global</literal>: liste les variables globales.
+                        <literal>"global"</literal>: liste les variables globales.
                     </para>
                 </listitem>
             </varlistentry>
@@ -32,7 +36,8 @@
                 <term>sorted</term>
                 <listitem>
                     <para>
-                        Valeur booléenne pour spécifier si la sortie doit être triée par ordre alphabétique.
+                        Valeur booléenne pour spécifier si la sortie doit être triée par ordre
+                        alphabétique.
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-a=1;
-b=2;
-[name, mem]=who("local");
-position=find(name=="a")
+[a, b] = (1, 2);
+[name, mem] = who("local");
+position = find(name=="a")
 mem(position) // Size used by a
-position=find(name=="d") // []
+position = find(name=="d") // []
 
 function foo(a,b)
     disp(who("scope", "sorted"))
 endfunction
-
 foo(1,2);
-
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
@@ -77,6 +79,9 @@ foo(1,2);
             <member>
                 <link linkend="who_user">who_user</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
         </simplelist>
     </refsection>
     <refsection role="history">
index 004f41d..8bcaac7 100644 (file)
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-clc();banner()
- ]]></programlisting>
+clc, banner()
+     ]]></programlisting>
+        <screen><![CDATA[
+        ___________________________________________
+                     scilab-6.1.0
+
+                        ESI Group
+           Copyright (c) 2017-2021 (ESI Group)
+       Copyright (c) 2011-2017 (Scilab Enterprises)
+             Copyright (c) 1989-2012 (INRIA)
+              Copyright (c) 1989-2007 (ENPC)
+        ___________________________________________
+]]></screen>
     </refsection>
 </refentry>
index 40bb52a..404ffeb 100644 (file)
@@ -6,9 +6,8 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>getdebuginfo()
-            dynamic_info = getdebuginfo();
-            [dynamic_info,static_info] = getdebuginfo();
+        <synopsis>
+            [dynamic_info, static_info] = getdebuginfo()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <function>getdebuginfo</function> は, Scilab に関するデバッグ情報を取得します.
         </para>
         <para>
-            <code>dynamic_info = getdebuginfo();</code> はシステムに関する情報を返します.
+            <literal>dynamic_info = getdebuginfo()</literal> はシステムに関する情報を返します.
         </para>
         <para>
-            <code>[dynamic_info,static_info] = getdebuginfo();</code> は,システムおよびScilabに
+            <literal>[dynamic_info, static_info] = getdebuginfo()</literal> は,システムおよびScilabに
             関する情報を返します.
         </para>
     </refsection>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-[a,b]=getdebuginfo()
- ]]></programlisting>
+[a, b] = getdebuginfo()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> [a, b] = getdebuginfo()
+ a  =
+  "Memory in use:      31 %"
+  "Total Physical Memory (Kbytes): 16618008"
+  "Free Physical Memory (Kbytes): 11381360"
+  "Total Paging File (Kbytes): 19108376"
+  "Free Paging File (Kbytes): 10309008"
+  "Total Virtual Memory (Kbytes): 137438953344"
+  "Free Virtual Memory (Kbytes): 137430188892"
+  "Free Extended Memory (Kbytes):       0"
+  "Operating System: Windows 8 x64"
+  "Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz"
+  "Number of processors: 12"
+  "Number of Video cards: 2"
+  "Video card #0: Intel(R) UHD Graphics 630"
+  "Video card #1: NVIDIA GeForce GTX 1660 Ti"
+  "Primary Video card driver version: 27.20.100.8681"
+  "Screen size: 1920 x 1080 32 bits"
+  "Number of Monitors: 1"
+  "Path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;..."
+  "ComSpec: C:\WINDOWS\system32\cmd.exe"
+  "TMP : C:\Users\me\AppData\Local\Temp"
+  "TEMP: C:\Users\me\AppData\Local\Temp"
+
+ b  =
+  "Version: scilab-6.1.0"
+  "Compilation date: Feb 25 2020"
+  "Compilation time: 11:34:32"
+  "Compiler Architecture: X64"
+  "Compiled with Microsoft compiler (191627035)"
+  "BLAS library optimized version: MKL"
+  "XML version: 2.9.1"
+  "Tcl/Tk: Enable"
+  "TCL version: 8.5.9"
+  "TK version: 8.5.9"
+  "Path separator: ;"
+  "Directory separator: \"
+  "PCRE Version: 8.21"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
index 29295e3..e95b907 100644 (file)
@@ -6,7 +6,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼出し手順</title>
-        <synopsis>res=getmodules()</synopsis>
+        <synopsis>res = getmodules()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
     </refsection>
     <refsection>
         <title>説明</title>
-        <para>Scilabにインストールされているモジュールの一覧を返します.</para>
+        <para>Scilabにインストールされているモジュールの名前の列を返します.
+        </para>
     </refsection>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-modules=getmodules();
+modules = getmodules();
 find(modules=="core");
 with_module("core");
  ]]></programlisting>
index e7588d4..c839b6f 100644 (file)
@@ -7,8 +7,7 @@
     <refsynopsisdiv>
         <title>呼出し手順</title>
         <synopsis>
-            OS=getos()
-            [OS,Version]=getos()
+            [OS, Version] = getos()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-OS=getos()
-[OS,version] = getos()
+OS = getos()
+[OS, version] = getos()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> OS = getos()
+ OS  =
+  "Windows"
+
+--> [OS, version] = getos()
+ OS  =
+  "Windows"
+
+ version  =
+  "8 x64"
+]]></screen>
+        <programlisting role="example"><![CDATA[
 if (getos() == "Windows") then
    disp("Scilab on Windows");
 end
@@ -35,7 +48,6 @@ end
 if (getos() == "Darwin") then
    disp("Scilab on MacOs");
 end
-
- ]]></programlisting>
+     ]]></programlisting>
     </refsection>
 </refentry>
index 63231db..18819bf 100644 (file)
     </refsynopsisdiv>
     <refsection>
         <title>説明</title>
-        <para>Scilabモードを返します. 以下の4 種類のモードがあります : STD , API , NW , NWNI .</para>
+        <para>Scilabモードを返します. 以下の4 種類のモードがあります : "STD", "API", "NW", "NWNI".</para>
         <para>
-            <literal>API</literal>Scilab はAPIとして起動されますi.
+            <literal>"API"</literal>Scilab はAPIとして起動されますi.
         </para>
         <para>
-            <literal>STD</literal>標準的なT Scilab (gui, plot ...)
+            <literal>"STD"</literal>標準的なT Scilab (gui, plot ...)
         </para>
         <para>
-            <literal>NW</literal>コマンドライン版 Scilab (プロット機能付き).
+            <literal>"NW"</literal>コマンドライン版 Scilab (プロット機能付き).
         </para>
         <para>
-            <literal>NWNI</literal>コマンドライン版Scilab (グラフィックなし).
+            <literal>"NWNI"</literal>コマンドライン版Scilab (グラフィックなし).
         </para>
     </refsection>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
 getscilabmode()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getscilabmode()
+ ans  =
+  "STD"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
index b72b6f0..54370e2 100644 (file)
         <title>例</title>
         <programlisting role="example"><![CDATA[
 getshell()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getshell()
+ ans  =
+  "cmd"
+]]></screen>
     </refsection>
 </refentry>
index f443622..4395c0d 100644 (file)
@@ -6,12 +6,12 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼出し手順</title>
-        <synopsis>version = getversion()
-            [version, opts] = getversion()
+        <synopsis>
+            [version, options] = getversion()
+            [COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
             version_numbers = getversion('scilab')
-            versioninfo = getversion('scilab', 'string_info')
             version_numbers = getversion('&lt;module&gt;')
-            versioninfo = getversion('&lt;module&gt;','string_info')
+            version = getversion('&lt;module&gt;','string_info')
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <varlistentry>
                 <term>version</term>
                 <listitem>
-                    <para>文字列</para>
+                    <para>バージョンに関する文字列. Example: "scilab-6.1.0"</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>versioninfo</term>
-                <listitem>
-                    <para>バージョンに関する文字列</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ver</term>
+                <term>version_numbers</term>
                 <listitem>
                     <para>整数ベクトル</para>
-                    <para>ver(1) メジャーバージョン</para>
-                    <para>ver(2) マイナーバージョン</para>
-                    <para>ver(3) メンテナンスバージョン</para>
-                    <para>ver(4) GIT タイムスタンプ</para>
+                    <para>version_numbers(1) メジャーバージョン</para>
+                    <para>version_numbers(2) マイナーバージョン</para>
+                    <para>version_numbers(3) メンテナンスバージョン</para>
+                    <para>version_numbers(4) GIT タイムスタンプ</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>opts</term>
+                <term>options</term>
                 <listitem>
                     <para>
                         文字列のベクトル:
@@ -53,9 +47,9 @@
     <refsection>
         <title>説明</title>
         <para>
-            <literal>[version, opts] = getversion()</literal>は
+            <literal>[version, options] = getversion()</literal>は
             Scilab バージョン名を<literal>version</literal>,
-            構築オプションを <literal>opts</literal>に返します.
+            構築オプションを <literal>options</literal>に返します.
             この構築オプションは,
             Scilabが tk または modelica を組み込んで構築されたかどうかを
             定義するために使用され, リリース日や時間も含まれます.
         <title>例</title>
         <programlisting role="example"><![CDATA[
 getversion()
+[version, options] = getversion()
+[COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
+or(options == 'modelicac')
+or(options == 'tk')
 
-[version, opts] = getversion()
-COMPILER = opts(1)
-ARCH = opts(2)
-or(opts == 'modelicac')
-or(opts == 'tk')
-RELEASE_MODE = opts($-2)
-RELEASE_DATE = opts($-1)
-RELEASE_TIME = opts($)
-
-version = getversion('scilab')
-versionstr = getversion('scilab','string_info')
-version = getversion('overloading')
-versionstr = getversion('overloading','string_info')
-
+numbers = getversion('scilab')
+version = getversion('scilab','string_info')
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index a1202b0..9e7453b 100644 (file)
         <title>例</title>
         <programlisting role="example"><![CDATA[
 r = ver()
- ]]></programlisting>
+     ]]></programlisting>
+           <screen><![CDATA[
+--> r = ver()
+ r  =
+  "Scilab Version: "                    "6.1.1.0"                                                         
+  "Operating System: "                  "Windows 10 10.0"                                                 
+  "Java version: "                      "1.8.0_151"                                                       
+  "Java runtime information: "          "Java(TM) SE Runtime Environment (build 1.8.0_151-b12)"           
+  "Java Virtual Machine information: "  "Java HotSpot(TM) 64-Bit Server VM (build 25.151-b12, mixed mode)"
+  "Vendor specification: "              "Oracle Corporation"                                              
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
index 7cdcba8..0731876 100644 (file)
@@ -8,7 +8,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>r=with_javasci()</synopsis>
+        <synopsis>r = with_javasci()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index dcc9546..f6cf550 100644 (file)
@@ -6,15 +6,22 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼出し手順</title>
-        <synopsis>str=lasterror( [opt] )
-            [str,n]=lasterror([opt])
-            [str,n,line,func]=lasterror([opt])
+        <synopsis>
+            [str,n,line,func] = lasterror()
+            [str,n,line,func] = lasterror(opt)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
         <variablelist>
             <varlistentry>
+                <term>opt</term>
+                <listitem>
+                    <para>論理値, %f の場合, 記録されたメッセージはクリアされる. デフォルトは %t.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>str</term>
                 <listitem>
                     <para>
                     <para>文字列, 直近に記録された関数名</para>
                 </listitem>
             </varlistentry>
-            <varlistentry>
-                <term>opt</term>
-                <listitem>
-                    <para>論理値, %f の場合, 記録されたメッセージはクリアされる. デフォルトは
-                        %t.
-                    </para>
-                </listitem>
-            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index a6d9cbe..10a9d0a 100644 (file)
             ファイル <link linkend="SCI">SCI</link>/etc/scilab.start と同様に,
             Scilabの起動時に自動的に実行されます.
         </para>
-    </refsection>
-    <refsection>
-        <title>注意</title>
-        <para>
-            スタートアップファイルの最終行は, 有効とするために
-            改行で終わる必要があります.
-        </para>
+        <warning>
+            <para>
+                スタートアップファイルの最終行は, 有効とするために
+                改行で終わる必要があります.
+            </para>
+        </warning>
     </refsection>
     <refsection>
         <title>例</title>
index 09c6a23..9d6b8fe 100644 (file)
@@ -24,7 +24,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>[i]=type(x)</synopsis>
+        <synopsis>i = type(x)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>パラメータ</title>
index 778b281..8689d04 100644 (file)
@@ -6,20 +6,21 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼出し手順</title>
-        <synopsis>[types [ [,names]]=typename()
+        <synopsis>
+            [indices, onames] = typename()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>パラメータ</title>
         <variablelist>
             <varlistentry>
-                <term>types</term>
+                <term>indices</term>
                 <listitem>
                     <para>整数列ベクトル: 各定義済みのデータ型の型コード.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>names</term>
+                <term>onames</term>
                 <listitem>
                     <para>文字列の列ベクトル: 型コードを指す名前.</para>
                 </listitem>
     <refsection>
         <title>説明</title>
         <para>
+            <literal>typename</literal> は
+            定義済みのデータ型に関する情報を返します.
+        </para>
+        <para>
             関数および演算子のオーバーロードにおいて,
             データ型に関連付けられた汎用名を
             オーバーロード関数の名前を作成する際に指定できる
             (<literal>tlist</literal> または <literal>mlist</literal>にコード化されたデータ型の
             場合,汎用名は他の方法で定義されます, <literal>overloading</literal>を参照ください).
         </para>
-        <para>
-            <literal>typename</literal> は
-            定義済みのデータ型に関する情報を返します.
-        </para>
+    </refsection>
+    <refsection>
+        <title>例</title>
+        <programlisting role="example"><![CDATA[
+[ind, onames] = typename();
+mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+    ]]></programlisting>
+       <screen><![CDATA[
+--> mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+Type index:   1  overloading code: "s"
+Type index:   2  overloading code: "p"
+Type index:   4  overloading code: "b"
+Type index:   5  overloading code: "sp"
+Type index:   6  overloading code: "spb"
+Type index:   7  overloading code: "msp"
+Type index:   8  overloading code: "i"
+Type index:   9  overloading code: "h"
+Type index:  10  overloading code: "c"
+Type index:  13  overloading code: "function"
+Type index:  14  overloading code: "f"
+Type index:  15  overloading code: "l"
+Type index:  16  overloading code: "tl"
+Type index:  17  overloading code: "ml"
+Type index: 128  overloading code: "ptr"
+Type index: 129  overloading code: "ip"
+Type index: 130  overloading code: "fptr"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
index f86facd..67269f8 100644 (file)
@@ -6,7 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼出し手順</title>
-        <synopsis>ve = exists(name [,where])</synopsis>
+        <synopsis>
+            ve = exists(name)
+            ve = exists(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index 27e3e1f..a285db0 100644 (file)
@@ -1,85 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="global">
-
     <refnamediv>
-
         <refname>global</refname>
-
         <refpurpose>グローバル変数を定義する</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼出し手順</title>
-
         <synopsis>global('nam1',...,'namn')
-
             global nam1 ... namn
-
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>nam1,..., namn</term>
-
                 <listitem>
-
                     <para>有効な変数名</para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             もともと, 各 Scilab 関数は固有のローカルな変数を有し,
-
             基本ワークスペースで作成された全ての変数を"読む"または
-
             関数コールにより読むことができます.
-
             <literal>global</literal> キーワードにより,複数の関数をまたがって
-
             変数を読み/書きすることができます.
-
             関数の内部で変数に代入すると,この変数を<literal>global</literal>として
-
             宣言した他の関数でも利用可能となります.
-
         </para>
-
         <para>
-
             <literal>global</literal>命令を初めて実行した時点で
-
             そのグローバス変数が存在しない場合,空行列に初期化されます.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
 //最初: 環境でコールし, 関数は変数を共用する
 global a
@@ -87,6 +46,7 @@ a=1
 deff('y=f1(x)','global a,a=x^2,y=a^2')
 f1(2)
 a
+
 //2回目: 3つの関数が変数を共用
 deff('initdata()','global A C ;A=10,C=30')
 deff('letsgo()','global A C ;disp(A) ;C=70')
@@ -95,42 +55,22 @@ initdata()
 letsgo()
 letsgo1()
  ]]></programlisting>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="who">who</link>
-
             </member>
-
             <member>
-
                 <link linkend="isglobal">isglobal</link>
-
             </member>
-
             <member>
-
                 <link linkend="clearglobal">clearglobal</link>
-
             </member>
-
             <member>
-
                 <link linkend="resume">resume</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
index 08e6ae0..ca3b8ee 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>ve = isdef(name [,where])</synopsis>
+        <synopsis>
+            ve = isdef(name)
+            ve = isdef(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index 4195e08..d913928 100644 (file)
@@ -8,18 +8,51 @@
         <title>呼出し手順</title>
         <synopsis>who
             who()
-            names = who('local')
-            [names, mem] = who('local')
-            names = who('global')
-            [names, mem] = who('global')
-            who('sorted')
-            names = who('local','sorted')
-            [names, mem] = who('local','sorted')
-            names = who('global','sorted')
-            [names, mem] = who('global','sorted')
+            [names, mem] = who(scope)
+            [names, mem] = who(scope, sorted)
+            [names, mem] = who(sorted)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
+        <title>設定</title>
+        <variablelist>
+            <varlistentry>
+                <term>scope</term>
+                <listitem>
+                    <para>
+                        <literal>"local"</literal>/<literal>"get"</literal>: list visible variables (not only in current function).
+                    </para>
+                    <para>
+                        <literal>"scope"</literal>/<literal>"current"</literal>: list variables in the current scope/function.
+                    </para>
+                    <para>
+                        <literal>"global"</literal>: list global variables.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>sorted</term>
+                <listitem>
+                    <para>
+                        Boolean value to specify if output must be sort in alphabetical order.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>names</term>
+                <listitem>
+                    <para>String matrix with variable names.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>mem</term>
+                <listitem>
+                    <para>Double matrix with variable used memory in bytes.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
         <title>説明</title>
         <para>
             <code>who()</code> は,カレントの変数名を表示します.
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-a=1;
-b=2;
-[name, mem]=who("local");
-position=find(name=="a")
+[a, b] = (1, 2);
+[name, mem] = who("local");
+position = find(name=="a")
 mem(position) // aにより使用される大きさ
-position=find(name=="d") // []
- ]]></programlisting>
+position = find(name=="d") // []
+
+function foo(a, b)
+    disp(who("scope", "sorted"))
+endfunction
+foo(1,2);
+     ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
@@ -57,6 +94,20 @@ position=find(name=="d") // []
             <member>
                 <link linkend="who_user">who_user</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.1</revnumber>
+                <revdescription>
+                    Add "scope" or "current" scope.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 3fbb0e3..0136a6a 100644 (file)
@@ -6,7 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>varList = who_user([bPrint])</synopsis>
+        <synopsis>
+            varList = who_user()
+            varList = who_user(bPrint)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>引数</title>
index 71ce483..6e1e3ee 100644 (file)
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-clc();banner()
- ]]></programlisting>
+clc, banner()
+     ]]></programlisting>
+        <screen><![CDATA[
+        ___________________________________________
+                     scilab-6.1.0
+
+                        ESI Group
+           Copyright (c) 2017-2021 (ESI Group)
+       Copyright (c) 2011-2017 (Scilab Enterprises)
+             Copyright (c) 1989-2012 (INRIA)
+              Copyright (c) 1989-2007 (ENPC)
+        ___________________________________________
+]]></screen>
     </refsection>
 </refentry>
index 7bc32a6..a487f98 100644 (file)
@@ -6,22 +6,68 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>getdebuginfo()
-            dynamic_info = getdebuginfo();
-            [dynamic_info,static_info] = getdebuginfo();
+        <synopsis>
+            [dynamic_info, static_info] = getdebuginfo()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Descrição</title>
         <para>getdebuginfo retorna informações sobre o Scilab para o debug.</para>
-        <para>dynamic_info = getdebuginfo(); retorna informações sobre o seu
-            sistema operacional.
+        <para>
+            dynamic_info = getdebuginfo(); retorna informações sobre o seu sistema operacional.
         </para>
-        <para>[dynamic_info,static_info] = getdebuginfo(); retorna informações
+        <para>
+            <literal>[dynamic_info, static_info] = getdebuginfo()</literal> retorna informações
             sobre o seu sistema operacional e sobre o Scilab.
         </para>
     </refsection>
     <refsection>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+[a, b] = getdebuginfo()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> [a, b] = getdebuginfo()
+ a  =
+  "Memory in use:      31 %"
+  "Total Physical Memory (Kbytes): 16618008"
+  "Free Physical Memory (Kbytes): 11381360"
+  "Total Paging File (Kbytes): 19108376"
+  "Free Paging File (Kbytes): 10309008"
+  "Total Virtual Memory (Kbytes): 137438953344"
+  "Free Virtual Memory (Kbytes): 137430188892"
+  "Free Extended Memory (Kbytes):       0"
+  "Operating System: Windows 8 x64"
+  "Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz"
+  "Number of processors: 12"
+  "Number of Video cards: 2"
+  "Video card #0: Intel(R) UHD Graphics 630"
+  "Video card #1: NVIDIA GeForce GTX 1660 Ti"
+  "Primary Video card driver version: 27.20.100.8681"
+  "Screen size: 1920 x 1080 32 bits"
+  "Number of Monitors: 1"
+  "Path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;..."
+  "ComSpec: C:\WINDOWS\system32\cmd.exe"
+  "TMP : C:\Users\me\AppData\Local\Temp"
+  "TEMP: C:\Users\me\AppData\Local\Temp"
+
+ b  =
+  "Version: scilab-6.1.0"
+  "Compilation date: Feb 25 2020"
+  "Compilation time: 11:34:32"
+  "Compiler Architecture: X64"
+  "Compiled with Microsoft compiler (191627035)"
+  "BLAS library optimized version: MKL"
+  "XML version: 2.9.1"
+  "Tcl/Tk: Enable"
+  "TCL version: 8.5.9"
+  "TK version: 8.5.9"
+  "Path separator: ;"
+  "Directory separator: \"
+  "PCRE Version: 8.21"
+]]></screen>
+    </refsection>
+    <refsection>
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
index 018b331..749d5a2 100644 (file)
@@ -6,7 +6,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>res=getmodules()</synopsis>
+        <synopsis>res = getmodules()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
             <varlistentry>
                 <term>res</term>
                 <listitem>
-                    <para>uma matriz de strings</para>
+                    <para>uma coluna de strings : nomes de módulos instalados no Scilab.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>Retorna a lista de módulos instalados no Scilab.</para>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+modules = getmodules();
+find(modules=="core");
+with_module("core");
+     ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
index c412f82..b4561ff 100644 (file)
@@ -6,27 +6,39 @@
     </refnamediv>
     <refsynopsisdiv>
         <title> Seqüência de Chamamento </title>
-        <synopsis>OS=getos()
-            [OS,Version]=getos()
+        <synopsis>
+            [OS, Version] = getos()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Descrição</title>
         <para>
-            <literal>getos </literal>retorna o nome e a versão do Sistema
-            Operacional
+            <literal>getos </literal>retorna o nome e a versão do Sistema Operacional.
         </para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-OS=getos()
-[OS,version] = getos()
+OS = getos()
+[OS, version] = getos()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> OS = getos()
+ OS  =
+  "Windows"
+
+--> [OS, version] = getos()
+ OS  =
+  "Windows"
+
+ version  =
+  "8 x64"
+]]></screen>
+        <programlisting role="example"><![CDATA[
 if (getos() == "Windows") then disp("Scilab on Windows"); end
 if (getos() == "Linux") then disp("Scilab on Linux"); end
 if (getos() == "SunOS") then disp("Scilab on Solaris"); end
 if (getos() == "Darwin") then disp("Scilab on MacOs"); end
-
- ]]></programlisting>
+     ]]></programlisting>
     </refsection>
 </refentry>
index b140271..5ad2533 100644 (file)
     </refsynopsisdiv>
     <refsection>
         <title>Descrição</title>
-        <para>Retorna o modo do Scilab. Quatro são os possíveis modos : STD , API
-            , NW , NWNI .
+        <para>Retorna o modo do Scilab. Quatro são os possíveis modos : "STD", "API", "NW" , "NWNI".
         </para>
         <para>
-            <literal>API</literal> o Scilab é lançado como um API.
+            <literal>"API"</literal> o Scilab é lançado como um API.
         </para>
         <para>
-            <literal>STD</literal> o Scilab padrão (gui, plot ...)
+            <literal>"STD"</literal> o Scilab padrão (gui, plot ...)
         </para>
         <para>
-            <literal>NW</literal> Scilab em linha de comando com esboços.
+            <literal>"NW"</literal> Scilab em linha de comando com esboços.
         </para>
         <para>
-            <literal>NWNI</literal> Scilab em linha de comando sem quaisquer
-            gráficos.
+            <literal>"NWNI"</literal> Scilab em linha de comando sem quaisquer gráficos.
         </para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
 getscilabmode()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getscilabmode()
+ ans  =
+  "STD"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
index a53439f..64a1a28 100644 (file)
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
 getshell()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getshell()
+ ans  =
+  "cmd"
+]]></screen>
     </refsection>
 </refentry>
index fb3a129..e0d8c3c 100644 (file)
@@ -6,21 +6,12 @@
     </refnamediv>
     <refsynopsisdiv>
         <title> Seqüência de Chamamento</title>
-        <synopsis>getversion()
-
-            [version, opts] = getversion()
-            COMPILER = opts(1)
-            ARCH = opts(2)
-            or(opts == 'modelicac')
-            or(opts == 'tk')
-            RELEASE_MODE = opts($-2)
-            RELEASE_DATE = opts($-1)
-            RELEASE_TIME = opts($)
-
-            version = getversion('scilab')
-            versionstr = getversion('scilab','string_info')
-            version = getversion('overloading')
-            versionstr = getversion('overloading','string_info')
+        <synopsis>
+            [version, options] = getversion()
+            [COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
+            version_numbers = getversion('scilab')
+            version_numbers = getversion('&lt;module&gt;')
+            version = getversion('&lt;module&gt;','string_info')
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <varlistentry>
                 <term>version</term>
                 <listitem>
-                    <para>um string</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>versioninfo</term>
-                <listitem>
-                    <para>um string sobre a versão</para>
+                    <para>um string sobre a versão. Exemplo: "scilab-6.1.0"</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>ver</term>
+                <term>version_numbers</term>
                 <listitem>
                     <para>um vetor de inteiros</para>
-                    <para>ver(1): versão maior</para>
-                    <para>ver(2): versão menor</para>
-                    <para>ver(3): versão de manutençãp</para>
-                    <para>ver(4): timestamp GIT</para>
+                    <para>version_numbers(1): versão maior</para>
+                    <para>version_numbers(2): versão menor</para>
+                    <para>version_numbers(3): versão de manutençãp</para>
+                    <para>version_numbers(4): timestamp GIT</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>opts</term>
+                <term>options</term>
                 <listitem>
                     <para>um vetor de strings:
                         <literal>[compiler, architecture, [tk, modelicac, ] release_mode, release_date, release_time]</literal>
@@ -62,7 +47,7 @@
         <title>Descrição</title>
         <para>
             Retorna em <literal>version</literal> o nome da versão do Scilab e
-            em <literal>opts</literal> build options ("opções de construção") que
+            em <literal>options</literal> build options ("opções de construção") que
             podem ser usadas para determinar se o Scilab foi construído em tk ou
             modelicac.
         </para>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
 getversion()
+[version, options] = getversion()
+[COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
+or(options == 'modelicac')
+or(options == 'tk')
 
-[version, opts] = getversion()
-COMPILER = opts(1)
-ARCH = opts(2)
-or(opt == 'modelicac')
-or(opt == 'tk')
-RELEASE_MODE = opts($-2)
-RELEASE_DATE = opts($-1)
-RELEASE_TIME = opts($)
-
-version = getversion('scilab')
-versionstr = getversion('scilab','string_info')
-version = getversion('overloading')
-versionstr = getversion('overloading','string_info')
-
+numbers = getversion('scilab')
+version = getversion('scilab','string_info')
  ]]></programlisting>
     </refsection>
     <refsection>
index 2dfcc2f..8a9399b 100644 (file)
@@ -23,7 +23,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>args=sciargs()</synopsis>
+        <synopsis>args = sciargs()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Descrição</title>
index e7d410e..fdcf7c7 100644 (file)
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
 r = ver()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> r = ver()
+ r  =
+  "Scilab Version: "                    "6.1.1.0"
+  "Operating System: "                  "Windows 10 10.0"
+  "Java version: "                      "1.8.0_151"
+  "Java runtime information: "          "Java(TM) SE Runtime Environment (build 1.8.0_151-b12)"
+  "Java Virtual Machine information: "  "Java HotSpot(TM) 64-Bit Server VM (build 25.151-b12, mixed mode)"
+  "Vendor specification: "              "Oracle Corporation"
+]]></screen>
     </refsection>
     <refsection>
         <title> Ver Também </title>
index dffa1a0..e1e0d5a 100644 (file)
@@ -6,7 +6,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>r=with_macros_source()</synopsis>
+        <synopsis>r = with_macros_source()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
index 4907a7f..f449746 100644 (file)
@@ -6,21 +6,21 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>r=with_module(module_name)</synopsis>
+        <synopsis>r = with_module(module_name)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
-                <term>r</term>
+                <term>module_name</term>
                 <listitem>
-                    <para>um booleano</para>
+                    <para>um string. Exemplo : 'core'</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>module_name</term>
+                <term>r</term>
                 <listitem>
-                    <para>um string. Exemplo : 'core'</para>
+                    <para>um booleano</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Descrição</title>
         <para>
-            Retorna <literal>%t</literal> se o módulo Scilab tiver sido
-            instalado.
+            Retorna <literal>%t</literal> se o módulo Scilab tiver sido instalado.
         </para>
     </refsection>
+    <refsection>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+withXML = with_module("xml");
+if withXML == %t then
+   disp("XML module enabled");
+else
+   disp("XML module disabled");
+end
+     ]]></programlisting>
+    </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
         <simplelist type="inline">
index d2880de..9b6a5db 100644 (file)
@@ -11,7 +11,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title> Seqüência de Chamamento </title>
-        <synopsis>[linenum,mac]=where()</synopsis>
+        <synopsis>[linenum, mac] = where()</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
index 5d37f8a..43a185f 100644 (file)
@@ -2,8 +2,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="whereami" xml:lang="pt">
     <refnamediv>
         <refname>whereami</refname>
-        <refpurpose>exibe a árvore de chamamento de instruções
-            corrente
+        <refpurpose>exibe a árvore de chamamento de instruções corrente
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
index e3bd0be..c721138 100644 (file)
@@ -27,7 +27,7 @@
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example">
+        <programlisting role="example"><![CDATA[
 a = 1;
 try, b = undefinedvariable + a; end
 [m,n0] = lasterror();
@@ -43,8 +43,8 @@ errclear(100)
 try, b = undefinedvariable + a; end
 errclear(999)
 [m,n] = lasterror(); n
-        </programlisting>
-      <screen><![CDATA[
+      ]]></programlisting>
+        <screen><![CDATA[
 --> try, b = undefinedvariable + a; end
 --> [m,n0] = lasterror();
 --> n0
index 7c01e57..0334d78 100644 (file)
@@ -6,9 +6,9 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>str=lasterror( [opt] )
-            [str,n]=lasterror([opt])
-            [str,n,line,func]=lasterror([opt])
+        <synopsis>
+            [str, n, line, func] = lasterror()
+            [str, n, line, func] = lasterror(opt)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -44,8 +44,7 @@
             <varlistentry>
                 <term>opt</term>
                 <listitem>
-                    <para>booleano, se %t for registrado, a mensagem é limpa. O padrão é
-                        %t
+                    <para>booleano, se %t for registrado, a mensagem é limpa. O padrão é %t
                     </para>
                 </listitem>
             </varlistentry>
@@ -77,7 +76,7 @@
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-ierr=execstr('a=zzzzzzz','errcatch')
+ierr = execstr('a=zzzzzzz','errcatch')
 if ierr>0 then disp(lasterror()),end
  ]]></programlisting>
     </refsection>
diff --git a/scilab/modules/core/help/pt_BR/exit.xml b/scilab/modules/core/help/pt_BR/exit.xml
deleted file mode 100644 (file)
index 8555c24..0000000
+++ /dev/null
@@ -1,31 +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:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="exit" xml:lang="pt">
-    <refnamediv>
-        <refname>exit</refname>
-        <refpurpose>termina a sessão Scilab corrente</refpurpose>
-    </refnamediv>
-    <refsection>
-        <title>Descrição</title>
-        <para>Termina a sessão Scilab corrente.</para>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="quit">quit</link>
-            </member>
-            <member>
-                <link linkend="abort">abort</link>
-            </member>
-            <member>
-                <link linkend="break">break</link>
-            </member>
-            <member>
-                <link linkend="return">return</link>
-            </member>
-            <member>
-                <link linkend="resume">resume</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index b63e4e8..90b22f8 100644 (file)
             estiverem presentes) quando o Scilab é chamado, junto com o arquivo
             <literal>scilab.star</literal> no diretório Scilab (SCI).
         </para>
+        <warning>
+            <para>A última linha de um arquivo de inicialização deve ser terminada por
+                uma nova linha a ser levada em conta.
+            </para>
+        </warning>
     </refsection>
     <refsection>
-        <title>Observações</title>
-        <para>A última linha de um arquivo de inicialização deve ser terminada por
-            uma nova linha a ser levada em conta.
-        </para>
-        <para>Definição de SCIHOME : no Windows : C:/Documents e
-            Settings/&lt;User>/Scilab/&lt;Scilab-Version>
-        </para>
-        <para>ou no Vista :
-            C:/&lt;User>/AppData/Roaming/Scilab/&lt;Scilab-Version>
-        </para>
-        <para>No Linux/Unix :
-            /home/&lt;User>/.Scilab/&lt;Scilab-Version>
-        </para>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+ls(SCIHOME)
+if ls(SCIHOME+"/scilab.ini") == [] & ls(SCIHOME+"/.scilab") == []
+   disp("No startup file defined");
+end
+     ]]></programlisting>
     </refsection>
     <refsection>
         <title>Ver Também</title>
index b689da6..6f062cc 100644 (file)
@@ -24,7 +24,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title> Seqüência de Chamamento </title>
-        <synopsis>[i]=type(x)</synopsis>
+        <synopsis>i = type(x)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
index eba5a3a..fdec5a3 100644 (file)
@@ -6,25 +6,23 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>[types [ [,names]]=typename()
+        <synopsis>[indices, onames] = typename()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
-                <term>types</term>
+                <term>indices</term>
                 <listitem>
-                    <para>vetor coluna de inteiros: os códigos dos tipos de cada tipo de
-                        dado definido.
+                    <para>vetor coluna de inteiros: os códigos dos tipos de cada tipo de dado definido.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>names</term>
+                <term>onames</term>
                 <listitem>
-                    <para>vetor coluna de strings: os nomes associados aos códigos de
-                        tipos.
+                    <para>vetor coluna de strings: os overloading nomes associados aos tipos.
                     </para>
                 </listitem>
             </varlistentry>
@@ -32,6 +30,9 @@
     </refsection>
     <refsection>
         <title>Descrição</title>
+        <para>
+            <literal>typename</literal> retorna informações sobre tipos de dados definidos.
+        </para>
         <para>O overloading de funções e operadores faz uso de nomes formais
             associados aos tipos de dados para formar o nome da função de overloading
             (ver overloading). <literal>typename</literal> pode ser usado para
             <literal>mlist</literal> são definidos de outra forma, ver
             <literal>overloading</literal>).
         </para>
-        <para>
-            <literal>typename</literal>
-            retorna informações sobre tipos de dados definidos.
-        </para>
+    </refsection>
+    <refsection>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+[ind, onames] = typename();
+mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+    ]]></programlisting>
+       <screen><![CDATA[
+--> mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+Type index:   1  overloading code: "s"
+Type index:   2  overloading code: "p"
+Type index:   4  overloading code: "b"
+Type index:   5  overloading code: "sp"
+Type index:   6  overloading code: "spb"
+Type index:   7  overloading code: "msp"
+Type index:   8  overloading code: "i"
+Type index:   9  overloading code: "h"
+Type index:  10  overloading code: "c"
+Type index:  13  overloading code: "function"
+Type index:  14  overloading code: "f"
+Type index:  15  overloading code: "l"
+Type index:  16  overloading code: "tl"
+Type index:  17  overloading code: "ml"
+Type index: 128  overloading code: "ptr"
+Type index: 129  overloading code: "ip"
+Type index: 130  overloading code: "fptr"
+]]></screen>
     </refsection>
     <refsection>
         <title> Ver Também </title>
index 2aa99bd..bed612d 100644 (file)
@@ -6,7 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>exists(name [,where])</synopsis>
+        <synopsis>
+            ve = exists(name)
+            ve = exists(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
@@ -14,7 +17,7 @@
             <varlistentry>
                 <term>name</term>
                 <listitem>
-                    <para>string</para>
+                    <para>matrix of character strings: names of queried variables.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>ve</term>
+                <listitem>
+                    <para>
+                        a matrix with the same size as <varname>name</varname> with possible values:
+                        <literal>1</literal> if true,
+                        <literal>0</literal> if false
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index ee92ce4..345897e 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>isdef(name [,where])</synopsis>
+        <synopsis>
+            ve = isdef(name)
+            ve = isdef(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
@@ -28,7 +31,7 @@
             <varlistentry>
                 <term>name</term>
                 <listitem>
-                    <para>um string </para>
+                    <para>matrix of strings: names of queried variables.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>ve</term>
+                <listitem>
+                    <para>
+                        a matrix with the same size as <varname>name</varname> with boolean values
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
@@ -91,6 +102,8 @@ go()
         <simplelist type="inline">
             <member>
                 <link linkend="exists">exists</link>
+            </member>
+            <member>
                 <link linkend="isglobal">isglobal</link>
             </member>
             <member>
index f9e2030..1dc07b4 100644 (file)
             /home/&lt;User&gt;/.Scilab/&lt;Scilab-Version&gt;
         </para>
     </refsection>
+    <refsection>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+a = 1;
+predef("all");
+clear a // fails
+predef("clear")
+clear a // works
+ ]]></programlisting>
+    </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="save">save</link>
             </member>
+            <member>
+                <link linkend="ans">ans</link>
+            </member>
+            <member>
+                <link linkend="startup">startup</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 2647c62..ec8edb6 100644 (file)
@@ -8,18 +8,51 @@
         <title>Seqüência de Chamamento </title>
         <synopsis>who
             who()
-            names=who('local')
-            [names,mem]=who('local')
-            names=who('global')
-            [names,mem]=who('global')
-            who('sorted')
-            names=who('local','sorted')
-            [names,mem]=who('local','sorted')
-            names=who('global','sorted')
-            [names,mem]=who('global','sorted')
+            [names, mem] = who(mode)
+            [names, mem] = who(mode, sorted)
+            [names, mem] = who(sorted)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
+        <title>Parâmetros</title>
+        <variablelist>
+            <varlistentry>
+                <term>mode</term>
+                <listitem>
+                    <para>
+                        <literal>local</literal>/<literal>get</literal>: list visible variables (not only in current function).
+                    </para>
+                    <para>
+                        <literal>scope</literal>/<literal>current</literal>: list variables in the current scope/function.
+                    </para>
+                    <para>
+                        <literal>global</literal>: list global variables.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>sorted</term>
+                <listitem>
+                    <para>
+                        Boolean value to specify if output must be sort in alphabetical order.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>names</term>
+                <listitem>
+                    <para>String matrix with variable names.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>mem</term>
+                <listitem>
+                    <para>Double matrix with variable used memory in bytes.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
         <title>Descrição</title>
         <para>
             <literal>who</literal> exibe os nome de variáveis correntes.
         </para>
     </refsection>
     <refsection>
+        <title>Examples</title>
+        <programlisting role="example"><![CDATA[
+a = 1;
+b = 2;
+[name, mem] = who("local");
+position = find(name=="a")
+mem(position) // Size used by a
+position = find(name=="d") // []
+
+function foo(a, b)
+    disp(who("scope", "sorted"))
+endfunction
+foo(1,2);
+     ]]></programlisting>
+    </refsection>
+    <refsection>
         <title> Ver Também </title>
         <simplelist type="inline">
             <member>
             <member>
                 <link linkend="who_user">who_user</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.1</revnumber>
+                <revdescription>
+                    Add "scope" or "current" mode.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 71b25b9..3824e4e 100644 (file)
     <refsection>
         <title>Descrição</title>
         <para>
-            <literal>who_user</literal> exibe os nomes das variáveis do
-            usuário.
+            <literal>who_user</literal> exibe os nomes das variáveis do usuário.
         </para>
     </refsection>
     <refsection>
+        <title>Examples</title>
+        <programlisting role="code_scilab"><![CDATA[
+clear
+who_user()
+who_user(%t)
+who_user(%f)
+a = 1;
+b = 2;
+who_user()
+who_user(%t)
+who_user(%f)
+      ]]></programlisting>
+    </refsection>
+    <refsection>
         <title> Ver Também </title>
         <simplelist type="inline">
             <member>
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.4.0</revnumber>
+                <revremark>
+                    <function>who_user</function> can now return user's
+                    variable names in a column vector of character strings.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 7f6e416..8f45b81 100644 (file)
@@ -64,6 +64,9 @@ whos -name %
                 <link linkend="who">who</link>
             </member>
             <member>
+                <link linkend="who_user">who_user</link>
+            </member>
+            <member>
                 <link linkend="typeof">typeof</link>
             </member>
         </simplelist>
index c24eb4a..cff7dea 100644 (file)
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-clc();banner()
- ]]></programlisting>
+clc, banner()
+     ]]></programlisting>
+        <screen><![CDATA[
+        ___________________________________________
+                     scilab-6.1.0
+
+                        ESI Group
+           Copyright (c) 2017-2021 (ESI Group)
+       Copyright (c) 2011-2017 (Scilab Enterprises)
+             Copyright (c) 1989-2012 (INRIA)
+              Copyright (c) 1989-2007 (ENPC)
+        ___________________________________________
+]]></screen>
     </refsection>
 </refentry>
index 50e68f1..34f84be 100644 (file)
@@ -7,9 +7,7 @@
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            getdebuginfo()
-            dynamic_info = getdebuginfo();
-            [dynamic_info, static_info] = getdebuginfo();
+            [dynamic_info, static_info] = getdebuginfo()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <function>getdebuginfo</function> получает информацию о Scilab'е для отладки.
         </para>
         <para>
-            <code>dynamic_info = getdebuginfo();</code> возвращает информацию о вашей системе.
+            <literal>dynamic_info = getdebuginfo()</literal> возвращает информацию о вашей системе.
         </para>
         <para>
-            <code>[dynamic_info,static_info] = getdebuginfo();</code> возвращает информацию о
+            <literal>[dynamic_info, static_info] = getdebuginfo()</literal> возвращает информацию о
             вашей системе и о Scilab'е.
         </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-[a,b]=getdebuginfo()
- ]]></programlisting>
+[a, b] = getdebuginfo()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> [a, b] = getdebuginfo()
+ a  =
+  "Memory in use:      31 %"
+  "Total Physical Memory (Kbytes): 16618008"
+  "Free Physical Memory (Kbytes): 11381360"
+  "Total Paging File (Kbytes): 19108376"
+  "Free Paging File (Kbytes): 10309008"
+  "Total Virtual Memory (Kbytes): 137438953344"
+  "Free Virtual Memory (Kbytes): 137430188892"
+  "Free Extended Memory (Kbytes):       0"
+  "Operating System: Windows 8 x64"
+  "Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz"
+  "Number of processors: 12"
+  "Number of Video cards: 2"
+  "Video card #0: Intel(R) UHD Graphics 630"
+  "Video card #1: NVIDIA GeForce GTX 1660 Ti"
+  "Primary Video card driver version: 27.20.100.8681"
+  "Screen size: 1920 x 1080 32 bits"
+  "Number of Monitors: 1"
+  "Path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;..."
+  "ComSpec: C:\WINDOWS\system32\cmd.exe"
+  "TMP : C:\Users\me\AppData\Local\Temp"
+  "TEMP: C:\Users\me\AppData\Local\Temp"
+
+ b  =
+  "Version: scilab-6.1.0"
+  "Compilation date: Feb 25 2020"
+  "Compilation time: 11:34:32"
+  "Compiler Architecture: X64"
+  "Compiled with Microsoft compiler (191627035)"
+  "BLAS library optimized version: MKL"
+  "XML version: 2.9.1"
+  "Tcl/Tk: Enable"
+  "TCL version: 8.5.9"
+  "TK version: 8.5.9"
+  "Path separator: ;"
+  "Directory separator: \"
+  "PCRE Version: 8.21"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
index 275c3ae..96efe59 100644 (file)
             <varlistentry>
                 <term>res</term>
                 <listitem>
-                    <para>матрица строк</para>
+                    <para>столбец строк: имена модулей, установленных в Scilab</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Описание</title>
-        <para>Возвращает список модулей, установленных в Scilab'е.</para>
-    </refsection>
-    <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-modules=getmodules();
+modules = getmodules();
 find(modules=="core");
 with_module("core");
  ]]></programlisting>
index c8f1a8e..45d5b72 100644 (file)
@@ -9,8 +9,7 @@
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            OS=getos()
-            [OS,Version]=getos()
+            [OS, Version] = getos()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-OS=getos()
-[OS,version] = getos()
+OS = getos()
+[OS, version] = getos()
+     ]]></programlisting>
+        <screen><![CDATA[
+--> OS = getos()
+ OS  =
+  "Windows"
+
+--> [OS, version] = getos()
+ OS  =
+  "Windows"
+
+ version  =
+  "8 x64"
+]]></screen>
+        <programlisting role="example"><![CDATA[
 if (getos() == "Windows") then
    disp("Scilab on Windows");
 end
index 44c920d..edb94ef 100644 (file)
     </refsynopsisdiv>
     <refsection>
         <title>Описание</title>
-        <para>Возвращает режим работы Scilab. Возможны 4 режима работы: STD, API, NW, NWNI.</para>
+        <para>Возвращает режим работы Scilab. Возможны 4 режима работы: "STD", "API", "NW", "NWNI".</para>
         <para>
-            <literal>API</literal>: Scilab запускается как интерфейс программирования приложений.
+            <literal>"API"</literal>: Scilab запускается как интерфейс программирования приложений.
         </para>
         <para>
-            <literal>STD</literal>: Стандартный режим работы (графический интерфейс, графики ...)
+            <literal>"STD"</literal>: Стандартный режим работы (графический интерфейс, графики ...)
         </para>
         <para>
-            <literal>NW</literal>: Scilab в командной строке с графиками.
+            <literal>"NW"</literal>: Scilab в командной строке с графиками.
         </para>
         <para>
-            <literal>NWNI</literal>: Scilab в командной строке без каких-либо графиков.
+            <literal>"NWNI"</literal>: Scilab в командной строке без каких-либо графиков.
         </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
 getscilabmode()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getscilabmode()
+ ans  =
+  "STD"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
index cff3518..6c56f31 100644 (file)
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
 getshell()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> getshell()
+ ans  =
+  "cmd"
+]]></screen>
     </refsection>
 </refentry>
index 6e29b59..f148245 100644 (file)
@@ -7,12 +7,11 @@
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            version = getversion()
-            [version, opts] = getversion()
+            [version, options] = getversion()
+            [COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
             version_numbers = getversion('scilab')
-            versioninfo = getversion('scilab', 'string_info')
             version_numbers = getversion('&lt;module&gt;')
-            versioninfo = getversion('&lt;module&gt;','string_info')
+            version = getversion('&lt;module&gt;','string_info')
         </synopsis>
     </refsynopsisdiv>
     <refsection>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>versioninfo</term>
+                <term>version</term>
                 <listitem>
-                    <para>строка о версии</para>
+                    <para>строка о версии. Например: "scilab-6.1.0"</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>version_numbers</term>
                 <listitem>
                     <para>вектор целых чисел</para>
-                    <para>ver(1) Старший номер версии</para>
-                    <para>ver(2) Младший номер версии</para>
-                    <para>ver(3) Номер технической версии</para>
-                    <para>ver(4) метка времени GIT</para>
+                    <para>version_numbers(1) Старший номер версии</para>
+                    <para>version_numbers(2) Младший номер версии</para>
+                    <para>version_numbers(3) Номер технической версии</para>
+                    <para>version_numbers(4) Метка времени GIT</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>opts</term>
+                <term>options</term>
                 <listitem>
                     <para>
                         вектор строк:
@@ -54,8 +53,8 @@
     <refsection>
         <title>Описание</title>
         <para>
-            <literal>[version, opts] = getversion()</literal> возвращает в <literal>version</literal>
-            название версии Scilab'а, а в <literal>opts</literal> -- опции сборки, которые могут быть
+            <literal>[version, options] = getversion()</literal> возвращает в <literal>version</literal>
+            название версии Scilab'а, а в <literal>options</literal> -- опции сборки, которые могут быть
             использованы для определения: собран ли  Scilab с tk или modelicac, а также предоставляет
             дату и время релиза.
         </para>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
 getversion()
+[version, options] = getversion()
+[COMPILER, ARCH, RELEASE_MODE, RELEASE_DATE, RELEASE_TIME] = (options(1), opt(2), options($-2), options($-1), options($))
+or(options == 'modelicac')
+or(options == 'tk')
 
-[version, opts] = getversion()
-COMPILER = opts(1)
-ARCH = opts(2)
-or(opts == 'modelicac')
-or(opts == 'tk')
-RELEASE_MODE = opts($-2)
-RELEASE_DATE = opts($-1)
-RELEASE_TIME = opts($)
-
-version = getversion('scilab')
-versionstr = getversion('scilab','string_info')
-version = getversion('overloading')
-versionstr = getversion('overloading','string_info')
-
+numbers = getversion('scilab')
+version = getversion('scilab','string_info')
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 987ea14..fad6617 100644 (file)
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
 r = ver()
- ]]></programlisting>
+     ]]></programlisting>
+        <screen><![CDATA[
+--> r = ver()
+ r  =
+  "Scilab Version: "                    "6.1.1.0"
+  "Operating System: "                  "Windows 10 10.0"
+  "Java version: "                      "1.8.0_151"
+  "Java runtime information: "          "Java(TM) SE Runtime Environment (build 1.8.0_151-b12)"
+  "Java Virtual Machine information: "  "Java HotSpot(TM) 64-Bit Server VM (build 25.151-b12, mixed mode)"
+  "Vendor specification: "              "Oracle Corporation"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
index 8aa5f0f..bc8ae73 100644 (file)
@@ -7,15 +7,21 @@
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            str=lasterror( [opt] )
-            [str,n]=lasterror([opt])
-            [str,n,line,func]=lasterror([opt])
+            [str, n, line, func] = lasterror()
+            [str, n, line, func] = lasterror(opt)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
+                <term>opt</term>
+                <listitem>
+                    <para>логическое значение, если %t, то записанное сообщение очищено. По умолчанию %t.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>str</term>
                 <listitem>
                     <para>
                     <para>строка, имя последней записанной функции.</para>
                 </listitem>
             </varlistentry>
-            <varlistentry>
-                <term>opt</term>
-                <listitem>
-                    <para>логическое значение, если %t, то записанное сообщение очищено. По умолчанию %t.
-                    </para>
-                </listitem>
-            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index fe124dd..e77da3f 100644 (file)
             <link linkend="SCIHOME">SCIHOME</link>/scilab.ini автоматически выполняются (если они есть)
             при запуске Scilab в дополнение к файлу <link linkend="SCI">SCI</link>/etc/scilab.start.
         </para>
-    </refsection>
-    <refsection>
-        <title>Примечания</title>
-        <para>
-            Для того, чтобы последняя строка файла начального запуска была учтена, необходимо,
-            чтобы файл заканчивался новой пустой строкой.
-        </para>
+        <warning>
+            <para>
+                Для того, чтобы последняя строка файла начального запуска была учтена, необходимо,
+                чтобы файл заканчивался новой пустой строкой.
+            </para>
+        </warning>
     </refsection>
     <refsection>
         <title>Примеры</title>
index 656394f..9fafa80 100644 (file)
@@ -6,20 +6,23 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>[types [ [,names]]=typename()
+        <synopsis>[indices, onames] = typename()
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
-                <term>types</term>
+                <term>indices</term>
                 <listitem>
-                    <para>вектор-столбец целочисленных значений: коды типов каждого из определённых типов данных.</para>
+                    <para>
+                        вектор-столбец целочисленных значений: коды типов каждого из определённых
+                        типов данных.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>names</term>
+                <term>onames</term>
                 <listitem>
                     <para>вектор-столбец строк: имена, связанные с кодами типов.</para>
                 </listitem>
     <refsection>
         <title>Описание</title>
         <para>
-            Перегрузка функции и оператора позволяет использовать формальное имя, связанное с типами данных для того, чтобы формировать имя функции перегрузки (см. <link linkend="overloading">перегрузку</link>). Функция <function>typename</function> может быть использована для управления этими формальными именами для жёстко запрограммированных типов данных (типы данных, запрограммированных с помощью <literal>tlist</literal> или <literal>mlist</literal>, определяются по-другому, см. <link linkend="overloading">перегрузку</link>).
+            Перегрузка функции и оператора позволяет использовать формальное имя, связанное с
+            типами данных для того, чтобы формировать имя функции перегрузки
+            (см. <link linkend="overloading">перегрузку</link>). Функция
+            <function>typename</function> может быть использована для управления этими формальными
+            именами для жёстко запрограммированных типов данных (типы данных, запрограммированных
+            с помощью <literal>tlist</literal> или <literal>mlist</literal>,
+            определяются по-другому, см. <link linkend="overloading">перегрузку</link>).
         </para>
         <para>
             функция <function>typename</function> вернёт информацию по определённым типам данных.
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-[typs,nams]=typename();
-disp("Первый тип (double) : " + string(typs(1)) + " / " + nams(1));
-]]></programlisting>
+[ind, onames] = typename();
+mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+    ]]></programlisting>
+       <screen><![CDATA[
+--> mprintf("Type index: %3d  overloading code: ""%s""\n", ind, onames)
+Type index:   1  overloading code: "s"
+Type index:   2  overloading code: "p"
+Type index:   4  overloading code: "b"
+Type index:   5  overloading code: "sp"
+Type index:   6  overloading code: "spb"
+Type index:   7  overloading code: "msp"
+Type index:   8  overloading code: "i"
+Type index:   9  overloading code: "h"
+Type index:  10  overloading code: "c"
+Type index:  13  overloading code: "function"
+Type index:  14  overloading code: "f"
+Type index:  15  overloading code: "l"
+Type index:  16  overloading code: "tl"
+Type index:  17  overloading code: "ml"
+Type index: 128  overloading code: "ptr"
+Type index: 129  overloading code: "ip"
+Type index: 130  overloading code: "fptr"
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
index 7d6b9b3..1f6053d 100644 (file)
@@ -6,24 +6,15 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>ve = exists(name [,where])</synopsis>
+        <synopsis>
+            ve = exists(name)
+            ve = exists(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
-                <term>ve</term>
-                <listitem>
-                    <para>
-                        результат с возможными значениями:
-                        <literal>1</literal>, если "истина";
-                    </para>
-                    <para>
-                        <literal>0</literal>, если "ложь";
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>name</term>
                 <listitem>
                     <para>символьная строка</para>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>ve</term>
+                <listitem>
+                    <para>
+                        результат с возможными значениями:
+                        <literal>1</literal>, если "истина";
+                    </para>
+                    <para>
+                        <literal>0</literal>, если "ложь";
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index 5411d1a..b4f2626 100644 (file)
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>ve = isdef(name [,where])</synopsis>
+        <synopsis>
+            ve = isdef(name)
+            ve = isdef(name, where)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
-                <term>ve</term>
-                <listitem>
-                    <para>
-                        матрица того же размера, что и <varname>name</varname> с логическими значениями
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
                 <term>name</term>
                 <listitem>
                     <para>матрица символьных строк</para>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>ve</term>
+                <listitem>
+                    <para>
+                        матрица того же размера, что и <varname>name</varname> с логическими значениями
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index c83765b..da3f91c 100644 (file)
@@ -6,21 +6,57 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>
-            who
+        <synopsis>who
             who()
-            names = who('local')
-            [names, mem] = who('local')
-            names = who('global')
-            [names, mem] = who('global')
-            who('sorted')
-            names = who('local','sorted')
-            [names, mem] = who('local','sorted')
-            names = who('global','sorted')
-            [names, mem] = who('global','sorted')
+            [names, mem] = who(scope)
+            [names, mem] = who(scope, sorted)
+            [names, mem] = who(sorted)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
+        <title>Аргументы</title>
+        <variablelist>
+            <varlistentry>
+                <term>scope</term>
+                <listitem>
+                    <para>
+                        <literal>"local"</literal> или <literal>"get"</literal>: список
+                        видимых переменных (не только в текущей функции).
+                    </para>
+                    <para>
+                        <literal>"scope"</literal> или <literal>"current"</literal>:
+                        список переменных в текущей области видимости/функции.
+                    </para>
+                    <para>
+                        <literal>"global"</literal>: список глобальных переменных.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>sorted</term>
+                <listitem>
+                    <para>
+                        Логическое значение для определения должен ли выход быть отсортирован в алфавитном порядке.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>names</term>
+                <listitem>
+                    <para>Матрица строк с именами переменных.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>mem</term>
+                <listitem>
+                    <para>
+                      Матрица чисел удвоенной точности с размером памяти, используемой переменными, в байтах.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
         <title>Описание</title>
         <para>
             <code>who()</code> выводит на экран имена текущих переменных.
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-a=1;
-b=2;
-[name, mem]=who("local");
-position=find(name=="a")
+[a, b] = (1, 2);
+[name, mem] = who("local");
+position = find(name=="a")
 mem(position) // Размер, используемый a
-position=find(name=="d") // []
- ]]></programlisting>
+position = find(name=="d") // []
+
+function foo(a, b)
+    disp(who("scope", "sorted"))
+endfunction
+foo(1,2);
+     ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
@@ -58,6 +98,20 @@ position=find(name=="d") // []
             <member>
                 <link linkend="who_user">who_user</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.1</revnumber>
+                <revdescription>
+                    Добавлена область видимости "scope" или "current".
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 570213d..8504400 100644 (file)
@@ -6,7 +6,10 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>who_user()</synopsis>
+        <synopsis>
+            varList = who_user()
+            varList = who_user(bPrint)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>varList</term>
+                <listitem>
+                    <para>
+                        вектор-столбец пользовательских переменных или <literal>[]</literal>, если у пользователя нет переменных.
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
             возвращает имена пользовательских переменных.
         </para>
     </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="code_scilab"><![CDATA[
+clear
+who_user()
+who_user(%t)
+who_user(%f)
+a = 1;
+b = 2;
+who_user()
+who_user(%t)
+who_user(%f)
+      ]]></programlisting>
+    </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
         <simplelist type="inline">
@@ -60,7 +85,8 @@
             <revision>
                 <revnumber>5.4.0</revnumber>
                 <revremark>
-                    <function>who_user</function> can now return user's variable names in a column vector of character strings.
+                    <function>who_user</function> теперь может возвращать имена пользовательских переменных
+                     в векторе-столбце символьных строк.
                 </revremark>
             </revision>
         </revhistory>