help pages: misc. typos, fixes and short improvements 04/18504/24
Samuel GOUGEON [Sun, 21 Aug 2016 14:35:47 +0000 (16:35 +0200)]
 * macr2tree and tree2code examples: cosh is no longer a macro
   => changed to log2
 * Improving Graphic sectionning (TBContinued in another commit)

Change-Id: Ia82d6fb587cfc3b5738cf3c62a9f56a28cf82432

106 files changed:
scilab/CHANGES.md
scilab/modules/api_scilab/help/en_US/legacy/hypermat/B_getHypermatOfDouble.xml
scilab/modules/api_scilab/help/en_US/legacy/hypermat/C_getHypermatOfInt.xml
scilab/modules/api_scilab/help/ja_JP/legacy/hypermat/B_getHypermatOfDouble.xml
scilab/modules/api_scilab/help/ja_JP/legacy/hypermat/C_getHypermatOfInt.xml
scilab/modules/console/help/en_US/completion.xml
scilab/modules/core/help/en_US/1_keywords/brackets.xml
scilab/modules/core/help/fr_FR/1_keywords/brackets.xml
scilab/modules/data_structures/help/en_US/type.xml
scilab/modules/data_structures/help/en_US/typeof.xml
scilab/modules/data_structures/help/fr_FR/addchapter.sce
scilab/modules/data_structures/help/fr_FR/type.xml
scilab/modules/data_structures/help/fr_FR/typeof.xml
scilab/modules/data_structures/help/pt_BR/typeof.xml
scilab/modules/development_tools/help/en_US/addchapter.sce
scilab/modules/development_tools/help/fr_FR/addchapter.sce
scilab/modules/development_tools/help/fr_FR/test_run.xml
scilab/modules/differential_equations/help/fr_FR/addchapter.sce
scilab/modules/elementary_functions/help/en_US/floating_point/format.xml
scilab/modules/elementary_functions/help/en_US/matrixoperations/kron.xml
scilab/modules/elementary_functions/help/fr_FR/bitwise/CHAPTER [new file with mode: 0644]
scilab/modules/elementary_functions/help/fr_FR/discrete/CHAPTER
scilab/modules/elementary_functions/help/fr_FR/floating_point/format.xml
scilab/modules/elementary_functions/help/fr_FR/matrixoperations/kron.xml
scilab/modules/elementary_functions/help/fr_FR/setoperations/CHAPTER
scilab/modules/elementary_functions/help/ja_JP/matrixoperations/kron.xml
scilab/modules/elementary_functions/help/pt_BR/matrixoperations/kron.xml
scilab/modules/elementary_functions/help/ru_RU/matrixoperations/kron.xml
scilab/modules/elementary_functions/macros/log2.sci
scilab/modules/fileio/help/en_US/save_format.xml
scilab/modules/fileio/help/ja_JP/save_format.xml
scilab/modules/fileio/help/ru_RU/save_format.xml
scilab/modules/functions/help/en_US/macr2tree.xml
scilab/modules/functions/help/en_US/overloading.xml
scilab/modules/functions/help/en_US/tree2code.xml
scilab/modules/functions/help/en_US/varargin.xml
scilab/modules/functions/help/fr_FR/macr2tree.xml
scilab/modules/functions/help/ja_JP/macr2tree.xml
scilab/modules/functions/help/ja_JP/overloading.xml
scilab/modules/functions/help/ja_JP/tree2code.xml
scilab/modules/functions/help/ja_JP/varargin.xml
scilab/modules/functions/help/pt_BR/macr2tree.xml
scilab/modules/functions/help/pt_BR/tree2code.xml
scilab/modules/functions/help/pt_BR/varargin.xml
scilab/modules/functions/help/ru_RU/macr2tree.xml
scilab/modules/functions/help/ru_RU/overloading.xml
scilab/modules/functions/help/ru_RU/tree2code.xml
scilab/modules/functions/help/ru_RU/varargin.xml
scilab/modules/graphics/help/en_US/2d_plot/plot2d.xml
scilab/modules/graphics/help/en_US/axes_operations/xgrid.xml [moved from scilab/modules/graphics/help/en_US/xgrid.xml with 100% similarity]
scilab/modules/graphics/help/en_US/figure_operations/pixel_drawing_mode.xml [moved from scilab/modules/graphics/help/en_US/pixel_drawing_mode.xml with 100% similarity]
scilab/modules/graphics/help/en_US/figure_operations/show_window.xml [moved from scilab/modules/graphics/help/en_US/window_control/show_window.xml with 100% similarity]
scilab/modules/graphics/help/en_US/figure_operations/winsid.xml [moved from scilab/modules/graphics/help/en_US/window_control/winsid.xml with 100% similarity]
scilab/modules/graphics/help/en_US/figure_operations/xdel.xml [moved from scilab/modules/graphics/help/en_US/xdel.xml with 100% similarity]
scilab/modules/graphics/help/en_US/figure_operations/xname.xml [moved from scilab/modules/graphics/help/en_US/xname.xml with 100% similarity]
scilab/modules/graphics/help/en_US/interaction/twinkle.xml [moved from scilab/modules/graphics/help/en_US/twinkle.xml with 100% similarity]
scilab/modules/graphics/help/en_US/pie.xml [moved from scilab/modules/graphics/help/en_US/pie/pie.xml with 100% similarity]
scilab/modules/graphics/help/en_US/text/xnumb.xml [moved from scilab/modules/graphics/help/en_US/xnumb.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/axes_operations/xgrid.xml [moved from scilab/modules/graphics/help/fr_FR/xgrid.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/color_management/CHAPTER
scilab/modules/graphics/help/fr_FR/figure_operations/CHAPTER [new file with mode: 0644]
scilab/modules/graphics/help/fr_FR/figure_operations/show_window.xml [moved from scilab/modules/graphics/help/fr_FR/window_control/show_window.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/figure_operations/winsid.xml [moved from scilab/modules/graphics/help/fr_FR/window_control/winsid.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/figure_operations/xdel.xml [moved from scilab/modules/graphics/help/fr_FR/xdel.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/figure_operations/xname.xml [moved from scilab/modules/graphics/help/fr_FR/xname.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/geometric_shapes/CHAPTER [new file with mode: 0644]
scilab/modules/graphics/help/fr_FR/interaction/CHAPTER [new file with mode: 0644]
scilab/modules/graphics/help/fr_FR/interaction/twinkle.xml [moved from scilab/modules/graphics/help/fr_FR/twinkle.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/lighting/CHAPTER [new file with mode: 0644]
scilab/modules/graphics/help/fr_FR/pie.xml [moved from scilab/modules/graphics/help/fr_FR/pie/pie.xml with 100% similarity]
scilab/modules/graphics/help/fr_FR/polygon/CHAPTER [new file with mode: 0644]
scilab/modules/graphics/help/fr_FR/text/xnumb.xml [moved from scilab/modules/graphics/help/fr_FR/xnumb.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/axes_operations/xgrid.xml [moved from scilab/modules/graphics/help/ja_JP/xgrid.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/figure_operations/pixel_drawing_mode.xml [moved from scilab/modules/graphics/help/ja_JP/pixel_drawing_mode.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/figure_operations/show_window.xml [moved from scilab/modules/graphics/help/ja_JP/window_control/show_window.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/figure_operations/winsid.xml [moved from scilab/modules/graphics/help/ja_JP/window_control/winsid.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/figure_operations/xdel.xml [moved from scilab/modules/graphics/help/ja_JP/xdel.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/figure_operations/xname.xml [moved from scilab/modules/graphics/help/ja_JP/xname.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/interaction/twinkle.xml [moved from scilab/modules/graphics/help/ja_JP/twinkle.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/pie.xml [moved from scilab/modules/graphics/help/ja_JP/pie/pie.xml with 100% similarity]
scilab/modules/graphics/help/ja_JP/text/xnumb.xml [moved from scilab/modules/graphics/help/ja_JP/xnumb.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/2d_plot/plot2d.xml
scilab/modules/graphics/help/pt_BR/axes_operations/xgrid.xml [moved from scilab/modules/graphics/help/pt_BR/xgrid.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/figure_operations/show_window.xml [moved from scilab/modules/graphics/help/pt_BR/window_control/show_window.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/figure_operations/winsid.xml [moved from scilab/modules/graphics/help/pt_BR/window_control/winsid.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/figure_operations/xdel.xml [moved from scilab/modules/graphics/help/pt_BR/xdel.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/figure_operations/xname.xml [moved from scilab/modules/graphics/help/pt_BR/xname.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/interaction/twinkle.xml [moved from scilab/modules/graphics/help/pt_BR/twinkle.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/pie.xml [moved from scilab/modules/graphics/help/pt_BR/pie/pie.xml with 100% similarity]
scilab/modules/graphics/help/pt_BR/text/xnumb.xml [moved from scilab/modules/graphics/help/pt_BR/xnumb.xml with 100% similarity]
scilab/modules/graphics/help/ru_RU/figure_operations/pixel_drawing_mode.xml [moved from scilab/modules/graphics/help/ru_RU/pixel_drawing_mode.xml with 100% similarity]
scilab/modules/graphics/help/ru_RU/figure_operations/show_window.xml [moved from scilab/modules/graphics/help/ru_RU/window_control/show_window.xml with 100% similarity]
scilab/modules/graphics/help/ru_RU/figure_operations/winsid.xml [moved from scilab/modules/graphics/help/ru_RU/window_control/winsid.xml with 100% similarity]
scilab/modules/graphics/help/ru_RU/figure_operations/xdel.xml [moved from scilab/modules/graphics/help/ru_RU/xdel.xml with 100% similarity]
scilab/modules/graphics/help/ru_RU/interaction/twinkle.xml [moved from scilab/modules/graphics/help/ru_RU/twinkle.xml with 100% similarity]
scilab/modules/helptools/help/en_US/addchapter.sce
scilab/modules/helptools/help/fr_FR/addchapter.sce
scilab/modules/history_manager/help/fr_FR/addchapter.sce
scilab/modules/localization/help/en_US/setdefaultlanguage.xml
scilab/modules/optimization/help/en_US/optimsimplex/CHAPTER
scilab/modules/scinotes/help/fr_FR/addchapter.sce
scilab/modules/simulated_annealing/help/en_US/addchapter.sce
scilab/modules/simulated_annealing/help/fr_FR/addchapter.sce
scilab/modules/sound/help/fr_FR/addchapter.sce
scilab/modules/tclsci/help/fr_FR/addchapter.sce
scilab/modules/xml/help/fr_FR/addchapter.sce

index 1ebfc00..73a8da1 100644 (file)
@@ -206,13 +206,16 @@ or a 3-components vector to set the position in axes coordinates to draw the dat
 Help pages:
 -----------
 
-* fixed / improved:  `members`, `part`, `ode`, `ode_optional_output`, `ode_roots`, `roots`,
-  `printf`, `sprintf`, `iconvert`, `stdev`, `xlabel`, `and_op`, `or_op`, `%helps`, `scilab|scilex`
+* fixed / improved:  `members`, `part`, `ode`, `ode_optional_output`, `ode_roots`, `plot2d`, `roots`,
+  `printf`, `sprintf`, `iconvert`, `stdev`, `xlabel`, `and_op`, `or_op`, `tree2code`, `%helps`,
+  `scilab|scilex`
 * rewritten: `consolebox`, `double`, `isoview`, `householder`, `or`, `and`, `format`, `typeof`,
-`brackets`, `setlanguage`, `sleep`, `isinf`, `bitor`, `bitxor`, `bitand`, `geomean`
+`brackets`, `setlanguage`, `sleep`, `isinf`, `bitor`, `bitxor`, `bitand`, `macr2tree`, `geomean`
 * reorganized:
   - `else`, `elseif`, `end`, `try`, `sciargs`, `global`, `halt`, `empty`, `power`
+  - `pixel_drawing_mode`, `show_window`, `twinkle`, `uigetcolor`, `winsid`, `xdel`, `xgrid`, `xname`, `xnumb`
   - CACSD and Signal Processing help pages have been sorted up.
+  - Signal processing: New `Convolution - correlation` subsection. `wfir_gui`, `filt_sinc`, `hilb`, `fft2`, `fftshift`,`ifftshift`, `hilbert`, `cepstrum`, `conv`, `conv2`, `convol2d`, `xcor`, `corr`, `hank`, `mrfit`, `frfir` sorted up in existing subsections.
   - Colormaps and GUI/Menus subsections created
 * translations added:
   - (fr): `format`, `typeof`, `isoview`, `ndgrid`, `bench_run`, `consolebox`, `harmean`, `sleep`, `strtod`
index 032b8f6..673f760 100644 (file)
@@ -156,8 +156,8 @@ int hypermatExample(char *fname,void* pvApiCtx)
     <refsection>
         <title>Scilab test script</title>
         <programlisting role="code_scilab"><![CDATA[
-a = hypermat([1 2 3], ones(1,6));
-b = a + %i*hypermat([1 2 3], 1:6);
+a = matrix(ones(1,6), [1 2 3]);
+b = a + %i*matrix(1:6, [1 2 3]);
 
 hypermatExample(a) == a
 hypermatExample(b) == b
index 05cb98c..4235687 100644 (file)
@@ -277,12 +277,12 @@ int hypermatIntExample(char *fname, void* pvApiCtx)
     <refsection>
         <title>Scilab test script</title>
         <programlisting role="code_scilab"><![CDATA[
-a = hypermat([1 2 3], int8(1:6));
-b = hypermat([1 2 3], uint8(1:6));
-c = hypermat([1 2 3], int16(1:6));
-d = hypermat([1 2 3], uint16(1:6));
-e = hypermat([1 2 3], int32(1:6));
-f = hypermat([1 2 3], uint32(1:6));
+a = matrix(int8(1:6), [1 2 3]);
+b = matrix(uint8(1:6), [1 2 3]);
+c = matrix(int16(1:6), [1 2 3]);
+d = matrix(uint16(1:6), [1 2 3]);
+e = matrix(int32(1:6), [1 2 3]);
+f = matrix(uint32(1:6), [1 2 3]);
 
 hypermatExampleInt(a) == a
 hypermatExampleInt(b) == b
index 5cf3138..9d66cb0 100644 (file)
@@ -149,8 +149,9 @@ int hypermatExample(char *fname, void* pvApiCtx)
     <refsection>
         <title>Scilab テストスクリプト</title>
         <programlisting role="code_scilab"><![CDATA[
-a = hypermat([1 2 3], ones(1,6));
-b = a + %i*hypermat([1 2 3], 1:6);
+a = matrix(ones(1,6), [1 2 3]);
+b = a + %i*matrix(1:6, [1 2 3]);
+
 hypermatExample(a) == a
 hypermatExample(b) == b
  ]]></programlisting>
index 7844752..262d280 100644 (file)
@@ -264,12 +264,13 @@ int hypermatIntExample(char *fname,void* pvApiCtx)
     <refsection>
         <title>Scilab テストスクリプト</title>
         <programlisting role="code_scilab"><![CDATA[
-a = hypermat([1 2 3], int8(1:6));
-b = hypermat([1 2 3], uint8(1:6));
-c = hypermat([1 2 3], int16(1:6));
-d = hypermat([1 2 3], uint16(1:6));
-e = hypermat([1 2 3], int32(1:6));
-f = hypermat([1 2 3], uint32(1:6));
+a = matrix(int8(1:6), [1 2 3]);
+b = matrix(uint8(1:6), [1 2 3]);
+c = matrix(int16(1:6), [1 2 3]);
+d = matrix(uint16(1:6), [1 2 3]);
+e = matrix(int32(1:6), [1 2 3]);
+f = matrix(uint32(1:6), [1 2 3]);
+
 hypermatExampleInt(a) == a
 hypermatExampleInt(b) == b
 hypermatExampleInt(c) == c
index e34dce4..328f36b 100644 (file)
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="completion" xml:lang="en">
     <refnamediv>
         <refname>completion</refname>
-        <refpurpose>returns words that start with the text you pass as
-            parameter.
+        <refpurpose>returns files or variables names or reserved keywords starting as a given text
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>r = completion(beginning_of_a_word)
-            r = completion(beginning_of_a_word,dictionary)
-            [functions, commands, variables, macros, graphic_properties, files] = completion(beginning_of_a_word)
-            [functions, commands, variables, macros, graphic_properties] = completion(beginning_of_a_word)
-            [functions, commands, variables, macros] = completion(beginning_of_a_word)
-            [functions, commands, variables] = completion(beginning_of_a_word)
+        <synopsis>
+            r = completion(beginning_of_a_word)
+            r = completion(beginning_of_a_word, dictionary)
             [functions, commands] = completion(beginning_of_a_word)
+            [functions, commands, variables] = completion(beginning_of_a_word)
+            [functions, commands, variables, macros] = completion(beginning_of_a_word)
+            [functions, commands, variables, macros, graphic_properties] = completion(beginning_of_a_word)
+            [functions, commands, variables, macros, graphic_properties, files] = completion(beginning_of_a_word)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
index 20455b6..20f15ef 100644 (file)
                                 </simplelist>
                             </listitem>
                             <listitem>The same variable may be used several times
-                                in the list. Then, multiple assignments overwrite
-                                the previous ones, from left to right.
+                                in the list. Then, multiple assignments are done from
+                                <emphasis role="italic">right to left (!)</emphasis>
+                                and overwrite the previous ones.
                                 Example :
-                                <literal>[a,b,a]=(%pi,%z,"Allo")</literal>
-                                is equivalent to <literal>a="Allo", b=%z</literal>.
+                                <literal>[a,b,a] = (%pi, %z, "Allo")</literal>
+                                is equivalent to <literal>a = %pi, b = %z</literal>.
                             </listitem>
                         </itemizedlist>
                     </para>
index a55538f..324c4cf 100644 (file)
                                 </simplelist>                            </listitem>
                             <listitem>La même variable peut être utilisée plusieurs
                                 fois dans la liste de gauche entre crochets.
-                                Le cas échéant, les affectations successives réalisées
-                                de gauche à droite dans la liste écrasent les contenus
-                                pré-existants. Exemple :
-                                <literal>[a,b,a]=(%pi,%z,"Allo")</literal>
-                                est équivalent à <literal>a="Allo", b=%z</literal>.
+                                Le cas échéant, les affectations successives sont réalisées
+                              <emphasis role="italic">de droite à gauche (!)</emphasis> dans la liste,
+                               et écrasent les contenus pré-existants. Exemple :
+                                <literal>[a,b,a] = (%pi, %z, "Allo")</literal>
+                                est équivalent à <literal>a = %pi, b = %z</literal>.
                             </listitem>
                         </itemizedlist>
                     </para>
index 1f2baef..a5b25e5 100644 (file)
                 Please note that, for some variables, <function>type</function> will return <literal>tlist</literal>
                 or <literal>mlist</literal> due to the internal data structure. This is the case of
                 <emphasis role="italic">rational</emphasis> and <emphasis role="italic">state-space</emphasis> matrices,
-                <emphasis role="italic">uitree</emphasis>, <emphasis role="italic">hypermat</emphasis> and <emphasis role="italic">struct</emphasis>. Please considering the use of
-                <link linkend="typeof">typeof</link> instead.
+                <emphasis role="italic">uitree</emphasis> and <emphasis role="italic">struct</emphasis>.
+                Please considering the use of <link linkend="typeof">typeof</link> instead.
             </note>
         </para>
     </refsection>
index 2119219..59af735 100644 (file)
             </tr>
             <tr>
                 <td>
+                    <emphasis role="bold">program</emphasis>
+                </td>
+                <td>
+                    <varname>object</varname> is a list describing the internal code of a function
+                    (see <link linkend="macr2tree">macr2tree</link>).
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <emphasis role="bold">cblock</emphasis>
+                </td>
+                <td>
+                    <varname>object</varname> is a block of columns of same
+                    heights but of different data types, as returned by
+                    <link linkend="mfscanf">mfscanf</link>.
+                </td>
+            </tr>
+            <tr>
+                <td>
                     <emphasis role="bold">XMLDoc</emphasis>
                 </td>
                 <td>
@@ -465,12 +484,17 @@ typeof(L)
 
 // Reserved T-List typeof
 // ----------------------
-typeof(dir())  // files directory
-
+typeof(dir())        // Files directory
+//
+c = macr2tree(sind); // Internal code of a Scilab macro
+typeof(c)
+fieldnames(c)'
+c.name
+//
 doc = xmlReadStr("<root><a att=""foo"">Hello</a></root>");
 typeof(doc)
 xmlDelete(doc)
-
+//
 x = 1;
 save(TMPDIR + "/x.sod", "x"); // SOD files are HDF5 ones
 a = h5open(TMPDIR + "/x.sod");
index 9126b5c..359627a 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Structures",SCI+"/modules/data_structures/help/fr_FR",%T);
+add_help_chapter("Listes Structures Cells",SCI+"/modules/data_structures/help/fr_FR",%T);
 
index e94e29f..b6196b3 100644 (file)
         <para>Note: pour certaines variables, à cause de la représentation
             interne, <emphasis role="italic">type(x)</emphasis> retournera
             tlist (16) ou mlist (17). C'est le cas de <emphasis role="italic">rational</emphasis>, <emphasis role="italic">state-space</emphasis>,
-            <emphasis role="italic">uitree</emphasis>, <emphasis role="italic">hypermat</emphasis> et <emphasis role="italic">struct</emphasis>. Merci de considérer l'utilisation
+            <emphasis role="italic">uitree</emphasis> et <emphasis role="italic">struct</emphasis>.
+            Merci de considérer l'utilisation
             de <link linkend="typeof">typeof</link> à la place.
         </para>
     </refsection>
index 558dbb8..1431acb 100644 (file)
             </tr>
             <tr>
                 <td>
+                    <emphasis role="bold">program</emphasis>
+                </td>
+                <td>
+                    <varname>object</varname> est une liste descrivant le code interne d'une fonction
+                    compilée écrite en Scilab (voir <link linkend="macr2tree">macr2tree</link>).
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <emphasis role="bold">cblock</emphasis>
+                </td>
+                <td>
+                    <varname>object</varname> est un bloc de colonnes de mêmes hauteurs mais de
+                    types de contenus différents, tel que produit par
+                    <link linkend="mfscanf">mfscanf</link>.
+                </td>
+            </tr>
+            <tr>
+                <td>
                     <emphasis role="bold">XMLDoc</emphasis>
                 </td>
                 <td>
@@ -475,14 +494,19 @@ typeof(L)
 // Typeof de T-List ou M-list prédéfinis réservés
 // ----------------------------------------------
 typeof(dir())  // listage du contenu d'un dossier
-
+//
+c = macr2tree(sind); // Code interne d'une macro Scilab
+typeof(c)
+fieldnames(c)'
+c.name
+//
 doc = xmlReadStr("<root><a att=""foo"">Hello</a></root>");
 typeof(doc)
 xmlDelete(doc)
-
+//
 x = 1;
 save(TMPDIR + "/x.sod", "x"); // Les fichiers SOD d'enregistrement d'objets
-                              //  Scilab sont au format HDF5
+//                            //  Scilab sont au format HDF5
 a = h5open(TMPDIR + "/x.sod");
 typeof(a)
 h5close(a)
index 7f7c5b2..3b9a251 100644 (file)
             </tr>
             <tr>
                 <td>
+                    <emphasis role="bold">program</emphasis>
+                </td>
+                <td>
+                    <varname>object</varname> is a list describing the internal code of a function
+                    (see <link linkend="macr2tree">macr2tree</link>).
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <emphasis role="bold">cblock</emphasis>
+                </td>
+                <td>
+                    <varname>object</varname> is a block of columns of same
+                    heights but of different data types, as returned by
+                    <link linkend="mfscanf">mfscanf</link>.
+                </td>
+            </tr>
+            <tr>
+                <td>
                     <emphasis role="bold">XMLDoc</emphasis>
                 </td>
                 <td>
@@ -466,12 +485,17 @@ typeof(L)
 
 // Reserved T-List typeof
 // ----------------------
-typeof(dir())  // files directory
-
+typeof(dir())        // Files directory
+//
+c = macr2tree(sind); // Internal code of a Scilab macro
+typeof(c)
+fieldnames(c)'
+c.name
+//
 doc = xmlReadStr("<root><a att=""foo"">Hello</a></root>");
 typeof(doc)
 xmlDelete(doc)
-
+//
 x = 1;
 save(TMPDIR + "/x.sod", "x"); // SOD files are HDF5 ones
 a = h5open(TMPDIR + "/x.sod");
index 1d7dd2c..f38e178 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Development tools",SCI+"/modules/development_tools/help/en_US",%T);
+add_help_chapter("Testing & benchmarking",SCI+"/modules/development_tools/help/en_US",%T);
 
index 8c99ce2..c08b8c9 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Outils de développement",SCI+"/modules/development_tools/help/fr_FR",%T);
+add_help_chapter("Tests - Bancs d''essais",SCI+"/modules/development_tools/help/fr_FR",%T);
 
index 736a3ff..99cbf95 100644 (file)
@@ -19,7 +19,7 @@
     <refnamediv>
         <refname>test_run</refname>
         <refpurpose>
-            Lance les tests unitaires et de non régression présents dans un module ou dans un répertoire. La passe de test vérifie d'abord que le test s'exécute sans erreur, puis que la sortie console (fichier <literal>dia</literal>) est conforme à un fichier de référence préalablement généré (fichier <literal>dia.ref</literal>).
+            Lance les tests unitaires et de non régression présents dans un module ou dans un répertoire
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
index ffc20d9..f7aad7b 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Calcul différentiel, Intégration",SCI+"/modules/differential_equations/help/fr_FR",%T);
+add_help_chapter("Intégration - dérivation",SCI+"/modules/differential_equations/help/fr_FR",%T);
 
index ef62cfc..bed2cbd 100644 (file)
@@ -55,7 +55,7 @@
                 <listitem>
                     <para>width of numbers = number of output characters used, all included: sign of
                       the mantissa, its digits, decimal separator, exponent symbol, sign and digits
-                      of the exponent. (default width = 10)</para>
+                      of the exponent. Default width = 10. Minimal width in "e" mode = 8.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index a265ece..ca3d23e 100644 (file)
@@ -81,7 +81,7 @@ kron(A,A)
 
 // With hypermatrices
 // ------------------
-b = hypermat([4 3 2], 1:24);
+b = matrix(1:24, [4 3 2]);
 
 // row .*. hypermat
 a = 1:2, b
@@ -100,7 +100,7 @@ a = [-1 -2; 2 1], b
 a.*.b
 
 // hypermat .*. hypermat
-a = hypermat([1 2 2],[-1,-2, 1 2]), b
+a = matrix([-1,-2, 1 2], [1 2 2]), b
 a.*.b
  ]]></programlisting>
     </refsection>
diff --git a/scilab/modules/elementary_functions/help/fr_FR/bitwise/CHAPTER b/scilab/modules/elementary_functions/help/fr_FR/bitwise/CHAPTER
new file mode 100644 (file)
index 0000000..1368211
--- /dev/null
@@ -0,0 +1 @@
+title = Opérations binaires
\ No newline at end of file
index d38bf0a..d1d2f33 100644 (file)
@@ -64,7 +64,8 @@
                         pour chaque nombre, tout inclus : signe et digits de la
                         mantisse, séparateur décimal ("."), symbole de l'exposant
                         ("D", "E"), signe et digits de l'exposant. Par défaut,
-                        <literal>width = 10</literal> caractères sont utilisés.
+                        <literal>width = 10</literal>.
+                        En notation exponentielle (mode "e"), il faut <literal>width >= 8</literal>.
                     </para>
                 </listitem>
             </varlistentry>
index 1e2221a..c1aae25 100644 (file)
@@ -77,7 +77,7 @@ kron(A,A)
 
 // avec des hypermatrices
 // ----------------------
-b = hypermat([4 3 2], 1:24);
+b = matrix(1:24, [4 3 2]);
 
 // row .*. hypermat
 clc
@@ -101,7 +101,7 @@ a.*.b
 
 // hypermat .*. hypermat
 clc
-a = hypermat([1 2 2],[-1,-2, 1 2]), b
+a = matrix([-1,-2, 1 2], [1 2 2]), b
 a.*.b
  ]]></programlisting>
     </refsection>
index cc1b11a..685f1ac 100644 (file)
@@ -63,7 +63,7 @@ kron(A,A)
 
 // With hypermatrices
 // ------------------
-b = hypermat([4 3 2], 1:24);
+b = matrix(1:24, [4 3 2]);
 
 // row .*. hypermat
 clc
@@ -87,7 +87,7 @@ a.*.b
 
 // hypermat .*. hypermat
 clc
-a = hypermat([1 2 2],[-1,-2, 1 2]), b
+a = matrix([-1,-2, 1 2], [1 2 2]), b
 a.*.b
  ]]></programlisting>
     </refsection>
index a772a72..e281f68 100644 (file)
@@ -62,7 +62,7 @@ kron(A,A)
 
 // com hypermatrizes
 // -----------------
-b = hypermat([4 3 2], 1:24);
+b = matrix(1:24, [4 3 2]);
 
 // row .*. hypermat
 clc
@@ -86,7 +86,7 @@ a.*.b
 
 // hypermat .*. hypermat
 clc
-a = hypermat([1 2 2],[-1,-2, 1 2]), b
+a = matrix([-1,-2, 1 2], [1 2 2]), b
 a.*.b
  ]]></programlisting>
     </refsection>
index 7baadcb..21993a3 100644 (file)
@@ -61,7 +61,7 @@ kron(A,A)
 
 // with hypermatrices
 // ------------------
-b = hypermat([4 3 2], 1:24);
+b = matrix(1:24, [4 3 2]);
 
 // row .*. hypermat
 clc
@@ -85,7 +85,7 @@ a.*.b
 
 // hypermat .*. hypermat
 clc
-a = hypermat([1 2 2],[-1,-2, 1 2]), b
+a = matrix([-1,-2, 1 2], [1 2 2]), b
 a.*.b
  ]]></programlisting>
     </refsection>
index cc64fc3..17557ea 100644 (file)
 // along with this program.
 
 function [f, e] = log2(x)
-    [lhs, rhs] = argn(0);
+    // x may be positive, negative, or complex
+    [lhs, rhs] = argn(0)
     if rhs <> 1 then
-        error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),"log2", 1));
+        msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+        error(msprintf(msg, "log2", 1))
     end
     if argn(1) == 1 then
-        f = log(x) / log(2);
+        f = log(x) / log(2)
     else
-        [f, e] = frexp(x);
+        [f, e] = frexp(x)
     end
 endfunction
index 923b849..6cc9c05 100644 (file)
             </tbody>
         </informaltable>
         <para>
-            Several "types" are based on <emphasis>tlist</emphasis> or <emphasis>mlist</emphasis>. It is the case of <emphasis>rational</emphasis>, <emphasis>state-space</emphasis>, <emphasis>hypermat</emphasis>, <emphasis>cell</emphasis> and <emphasis>struct</emphasis>. They are therefore transparently saved.
+            Several "types" are based on <emphasis>tlist</emphasis> or <emphasis>mlist</emphasis>.
+          It is the case of <emphasis>rational</emphasis>, <emphasis>state-space</emphasis>,
+          <emphasis>cell</emphasis> and <emphasis>struct</emphasis>. They are therefore transparently saved.
         </para>
         <para>
             <emphasis>void </emphasis>and <emphasis>undefined </emphasis>are two specific elements created to manage special cases in the list management. They are described later in this document.
index 0464f50..84d2b6a 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="save_format" xml:lang="ja">
-
     <refnamediv>
-
         <refname>save_format</refname>
-
         <refpurpose>"save"で作成されるファイルの形式</refpurpose>
-
     </refnamediv>
-
     <refsection>
-
         <title>概要</title>
-
         <para>本文書の目的はデータをScilabでデータ保存に使用されるHDF5形式について規定することです.
-
         </para>
-
         <para>この形式はSOD (Scilab Open Data) と呼ばれます.</para>
-
         <para>SODの最初の公開リリースは Scilab 5.4.0で行われました.</para>
-
     </refsection>
-
     <refsection>
-
         <title>動機</title>
-
         <para>
-
             相互運用性は近代的なソフトウエアの主要な特性の一つです.
-
             この特性をより改善するため, このSEPにおいて HDF5 形式の標準定義
-
             が提案されました.
-
         </para>
-
         <para>
-
             Scilab 5.2.0以降,
-
             エキスポート/インポート機能が開発され, データ交換用に管理されています.
-
             これは, 既にデータを保存および交換するためのXcosの基本要素の一つです.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>サポートされるデータ型</title>
-
         <para>全てのScilabデータ型がサポートされます. 例えば:</para>
-
         <informaltable border="1">
-
             <tbody>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">名前</emphasis>
-
                     </td>
-
                     <td>
-
                         <emphasis role="bold">Scilabにおける例</emphasis>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">double</emphasis>
-
                     </td>
-
                     <programlisting>
-
                         A=32;
-
                         b=[32,2];
-
                         c=[2,2;3,4];
-
                         d=rand(10,10);
-
                     </programlisting>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">string</emphasis>
-
                     </td>
-
                     <programlisting>
-
                         a="my string";
-
                         b=["string 1";"my string 2"];
-
                     </programlisting>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">boolean</emphasis>
-
                     </td>
-
                     <programlisting>
-
                         a=%t;
-
                         b=[%t, %f];
-
                     </programlisting>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">integer</emphasis>
-
                     </td>
-
                     <td>
-
                         <programlisting>
-
                             int8([1 -120 127 312])
-
                             x=int32(-200:100:400)
-
                         </programlisting>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">polynomial</emphasis>
-
                     </td>
-
                     <td>
-
                         <programlisting>
-
                             s=poly([2 3],"s")
-
                             poly(1:4,'s','c')
-
                         </programlisting>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">sparse</emphasis>
-
                     </td>
-
                     <td align="justify">
-
                         <programlisting>
-
                             sp=sparse([1,2;4,5;3,10],[1,2,3])
-
                         </programlisting>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">boolean sparse</emphasis>
-
                     </td>
-
                     <td align="justify">
-
                         <programlisting>
-
                             dense=[%F, %F, %T, %F, %F
-
                             %T, %F, %F, %F, %F
-
                             %F, %F, %F, %F, %F
-
                             %F, %F, %F, %F, %T];
-
                             sp=sparse(dense)
-
                         </programlisting>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">list</emphasis>
-
                     </td>
-
                     <td align="justify">
-
                         <programlisting>
-
                             l = list(1,["a" "b"])
-
                         </programlisting>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">tlist</emphasis>
-
                     </td>
-
                     <td align="justify">
-
                         <programlisting>
-
                             t = tlist(["listtype","field1","field2"], [], []);
-
                         </programlisting>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <emphasis role="bold">mlist</emphasis>
-
                     </td>
-
                     <td align="justify">
-
                         <programlisting>
-
                             M=mlist(['V','name','value'],['a','b';'c' 'd'],[1 2; 3 4]);
-
                         </programlisting>
-
                     </td>
-
                 </tr>
-
             </tbody>
-
         </informaltable>
-
         <para>
-
             複数の"types"は,<emphasis>tlist</emphasis> または <emphasis>mlist</emphasis>
-
             に基づいています.
-
             これは,
-
             <emphasis>rational</emphasis>, <emphasis>state-space</emphasis>,
-
-            <emphasis>hypermat</emphasis>, <emphasis>cell</emphasis> および
-
+            <emphasis>cell</emphasis> および
             <emphasis>struct</emphasis>の場合です.
-
             これらは透過的に保存されます.
-
         </para>
-
         <para>
-
             <emphasis>void</emphasis>および <emphasis>undefined</emphasis>は,
-
             リスト管理において特別な場合を管理するために作成された特殊な要素です.
-
             これらはこの文書にて後述します.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>HDF5ファイルの構造</title>
-
         <para>Scilab HDF5 アーキテクチャは非常に簡単です. </para>
-
         <emphasis role="bold">General</emphasis>
-
         <para>
-
             各Scilab変数について, ルート位置におけるデータセットが宣言されます.
-
             データセットの名前はScilab変数の名前です.
-
         </para>
-
         <para>例, 以下のコード:</para>
-
         <programlisting>
-
             emptyuint32matrix = uint32([]);
-
             uint32scalar = uint32(1);
-
             uint32rowvector = uint32([1 4 7]);
-
             uint32colvector = uint32([1;4;7]);
-
             uint32matrix = uint32([1 4 7;9 6 3]);
-
             save("uint32.sod","emptyuint32matrix","uint32scalar","uint32rowvector","uint32colvector","uint32matrix");
-
         </programlisting>
-
         <para>produces:</para>
-
         <mediaobject>
-
             <imageobject>
-
                 <imagedata fileref="../images/img001.png" width="5.95cm" depth="1.64cm"/>
-
             </imageobject>
-
         </mediaobject>
-
         <para>
-
             各ルートデータセットは<literal>SCILAB_Class</literal>と呼ばれる
-
             属性を有します.この属性は, HDF5ファイルに保持される変数の型を定義します.
-
         </para>
-
         <para>
-
             変数がプリミティブ型で関連する複合値がない場合,
-
             データは直接データセットに保存されます.
-
             それ以外の場合, データセットは実際のデータへのリファレンスを有します.
-
         </para>
-
         <para>各 SOD ファイルは2つの固有の変数を有します:</para>
-
         <itemizedlist>
-
             <listitem>
-
                 <para>
-
                     <literal>SCILAB_scilab_version</literal> ?
-
                     SODファイルに保存する際に使用された Scilabのバージョンを記述します.
-
                 </para>
-
                 <para>例えば, Scilab 5.4.0の場合, このデータは以下となります:</para>
-
                 <para>
-
                     <emphasis>SCILAB_scilab_version = scilab-5.4.0</emphasis>
-
                 </para>
-
             </listitem>
-
             <listitem>
-
                 <para>SCILAB_sod_version ?
-
                     SODファイルに保存する際に使用された SOD規約のバージョンを記述します.
-
                 </para>
-
                 <para>例えば, Scilab 5.4.0の場合, このデータは以下となります:</para>
-
                 <para>
-
                     <emphasis>SCILAB_sod_version = 2</emphasis>
-
                 </para>
-
             </listitem>
-
         </itemizedlist>
-
         <para>
-
             データがデータセット内で直線的に保存される型
-
         </para>
-
         <informaltable border="1">
-
             <tbody>
-
                 <tr>
-
                     <td align="left">
-
                         <emphasis role="bold">Scilab 型</emphasis>
-
                     </td>
-
                     <td align="left">
-
                         <emphasis role="bold">HDF5 Scilab 型属性</emphasis>
-
                     </td>
-
                     <td align="left">
-
                         <emphasis role="bold">HDF5 属性</emphasis>
-
                     </td>
-
                     <td align="left">
-
                         <emphasis role="bold">HDF データ型マッピング</emphasis>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td align="left">
-
                         <para>string</para>
-
                     </td>
-
                     <td align="left">
-
                         <para>SCILAB_Class = string</para>
-
                     </td>
-
                     <td align="left">
 
-
-
                     </td>
-
                     <td align="left">
-
                         <para>String</para>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td align="left">
-
                         <para>boolean</para>
-
                     </td>
-
                     <td namest="c2" nameend="c3" align="left">
-
                         <para>SCILAB_Class = boolean</para>
-
                     </td>
-
                     <td align="left">
 
-
-
                     </td>
-
                     <td align="left">
-
                         <para>32ビット 整数</para>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td align="left">
-
                         <para>integer</para>
-
                     </td>
-
                     <td namest="c2" nameend="c3" align="left">
-
                         <para>SCILAB_Class = integer</para>
-
                     </td>
-
                     <td align="left">
-
                         <para>SCILAB_precision = {8, 16, 32, u8, u16, u32}</para>
-
                     </td>
-
                     <td namest="c1" nameend="c2" align="left">
-
                         <para>8 = 8ビット文字</para>
-
                         <para>16 = 16ビット整数</para>
-
                         <para>32 = 32ビット整数</para>
-
                         <para>u8 = 8ビット符号無し文字</para>
-
                         <para>u16 = 16ビット符号無し整数</para>
-
                         <para>u32 = 32ビット符号無し整数</para>
-
                     </td>
-
                 </tr>
-
             </tbody>
-
         </informaltable>
-
         <para>
-
             これらの型について, Scilabにおける場合と同様に,
-
             データは1次元配列に保存されます.データは列方向に保存されます.
-
         </para>
-
         <para>
-
             行列, ベクトルまたはスカラーを再構築するために,
-
             2つの属性が列と行の数を指定します.
-
         </para>
-
         <para>
-
             5.4.0リリースおよび SOD v2以降,
-
             <literal>SCILAB_cols</literal> および<literal>SCILAB_rows</literal> は
-
             double, 整数, 多項式および文字列の行列ではもはや使用されなくなりました.
-
             SOD はネーティブな多次元HDF5機能を使用します.
-
         </para>
-
         <para>
-
             <emphasis role="bold">例</emphasis>
-
         </para>
-
         <para>
-
             宣言の保存: <code>int32([1 -4 7;-9 6 -3])</code> は,hdfviewで以下のように表示されます:
-
         </para>
-
         <mediaobject>
-
             <imageobject>
-
                 <imagedata fileref="../images/img002.png" width="5.95cm" depth="1.64cm"/>
-
             </imageobject>
-
         </mediaobject>
-
         <para>metadataは以下のようになります:</para>
-
         <emphasis role="italic">
-
             <para>int32matrix (800, 2)</para>
-
             <para>32-bit integer, 3 x 2 =&gt; the size of the variable</para>
-
             <para>Number of attributes = 2</para>
-
             <para>SCILAB_Class = integer</para>
-
             <para>SCILAB_precision = 32</para>
-
         </emphasis>
-
         <para>
-
             <note>
-
                 スカラー値は1行1列の行列に保存されます.
-
             </note>
-
         </para>
-
         <para>
-
             空の変数 (<literal>[]</literal>) はtrueに設定された属性<literal>SCILAB_empty</literal>を有します.
-
         </para>
-
         <para>
-
             <emphasis role="bold">データが専用のグループに保存される型</emphasis>
-
         </para>
-
         <para>
-
             Scilabデータ型の多くはグループで保存されます.
-
             これにより,値の分離を明確にでき,アクセスも容易になります.
-
         </para>
-
         <para>
-
             グループは"#"で括られた変数から命名されます.例えば,
-
             matrixofdoubleと呼ばれるdoubleの行列の場合,
-
             ルートデータセットの名前は matrixofdoubleとなり,
-
             関連するグループの名前は
-
             <emphasis role="strong">#matrixofdouble#</emphasis>となります.
-
         </para>
-
         <para>
-
             再帰的なデータ型(list, mlist, tlist, etc)の場合,
-
             サブグループの名前が以下のように構築されます:
         </para>
-
         <para>
-
             この <literal>#</literal> によりユニークなIDを作成できるようになります.
-
             最初の<literal>#</literal>の数は深さのレベルを示します.
-
             例えば, サブリスト <emphasis>###listnested#_#2##_#1##</emphasis>は,
-
             2番目のレベ得るに位置することを示します.
-
         </para>
-
         <para>
-
             アンダースコア "_" は深さを表す手段です.
-
             通常, "/" 文字がこのような場合に使用されますが,
-
             HDF5規約では予約済みキーワードとなっています.
-
         </para>
-
         <para>
-
             名前で使用される整数は,
-
             カレントの構造における位置と親要素に関する位置の両方の意味で
-
             データ構造における位置を表します.
-
             例えば,
-
             <emphasis>###listnested#_#2##_#1##</emphasis>,
-
             は,親要素の3番目の構造の2番目の要素として扱われることを示します
-
             (要素は0から番号付けられます).
-
         </para>
-
         <para>
-
             例えば, <emphasis>###listnested#_#2##_#1##</emphasis>という名前のグループは,
-
             以下の例では値 [32, 42] を指します:
-
         </para>
-
         <programlisting>
-
             listnested=list(2,%i,'f',ones(3,3))
-
             listnested(3) = list( %t, [32,42]);
-
         </programlisting>
-
         <para>
-
             <emphasis role="bold">疎行列</emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab 型:</emphasis> sparse
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis> SCILAB_Class = sparse
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 属性: </emphasis>
-
         </para>
-
         <para>SCILAB_rows = &lt;int&gt;</para>
-
         <para>行数</para>
-
         <para>
-
             <emphasis>SCILAB_cols = &lt;int&gt;</emphasis>
-
         </para>
-
         <para>列数</para>
-
         <para>
-
             <emphasis>SCILAB_items = &lt;int&gt;</emphasis>
-
         </para>
-
         <para>疎行列における要素数を定義</para>
-
         <para>
-
             <emphasis role="strong">ルートデータセットの値:</emphasis>
-
         </para>
-
         <para>
-
             最初の値 (<literal>#0#</literal>):
-
             このデータ構造の各要素は各行の非ヌル要素の数を示します.
-
             つまり, 最初の要素は疎行列の最初の行の要素数を示します.
-
         </para>
-
         <para>
-
             2番目の値 (<literal>#1#</literal>):
-
             疎行列の各要素の列の位置を示します.
-
         </para>
-
         <para>
-
             3番目の値 (<literal>#2#</literal>):
-
             疎行列における要素の実際の値へのリファレンスを保存します
-
             (この値は専用のグループに保存されます).
-
         </para>
-
         <para>例えば, この行列を考えると:</para>
-
         <programlisting role="no-scilab-exec">
-
             0. 1. 0. 0. 0. 0. 0. 0. 0. 0.
-
             0. 0. 0. 0. 0. 0. 0. 0. 0. 0.
-
             0. 0. 0. 0. 0. 0. 0. 0. 0. 3.
-
             0. 0. 0. 0. 2. 0. 0. 0. 0. 0.
-
         </programlisting>
-
         <para>これは以下の関数で生成されます:</para>
-
         <programlisting role="scilab_code">
-
             sparse([1,2;4,5;3,10],[1,2,3])
-
         </programlisting>
-
         <para>
-
             これは以下となります:
-
         </para>
-
         <para>
-
             <emphasis>#0#</emphasis> は,<emphasis>1;0;1;1</emphasis>を有します
-
         </para>
-
         <para>
-
             <emphasis>#1#</emphasis> は,<emphasis>2;10;5</emphasis>を有します
-
         </para>
-
         <para>
-
             <emphasis>#2#</emphasis> は,<emphasis>1.0; 3.0; 2.0</emphasis>を有する
-
             double(この例では複素数ではありません)の行列を参照します
-
         </para>
-
         <para>
-
             <emphasis role="bold">論理値疎行列</emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab型:</emphasis> boolean sparse
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis> SCILAB_Class = boolean sparse
-
         </para>
-
         <para>
-
             <emphasis>HDF5属性:</emphasis>
-
         </para>
-
         <para>
-
             <emphasis>SCILAB_rows = &lt;int&gt;</emphasis>
-
         </para>
-
         <para>行数</para>
-
         <para>
-
             <emphasis>SCILAB_cols = &lt;int&gt;</emphasis>
-
         </para>
-
         <para>列数</para>
-
         <para>
-
             <emphasis>SCILAB_items = &lt;int&gt;</emphasis>
-
         </para>
-
         <para>疎行列の要素数を定義</para>
-
         <para>
-
             <emphasis role="strong">ルートデータセットの値:</emphasis> 疎行列は3つのデータセットを有しますが,
-
             論理値疎行列は2つのみです.これは定義される値は自動的にtrueとみなされるためです.
-
         </para>
-
         <para>
-
             最初の値 (<literal>#0#</literal>): このデータ構造の各要素は各行の非ゼロ要素の数を示します.
-
         </para>
-
         <para>
-
             つまり, 最初の要素は疎行列の最初の行の要素数を示します.
-
         </para>
-
         <para>
-
             2番目の値 (<literal>#1#</literal>):
-
             疎行列の各要素の列の位置を示します.
-
         </para>
-
         <para>以下の論理値疎行列について:</para>
-
         <programlisting>
-
             dense=[%F, %F, %T, %F, %F
-
             %T, %F, %F, %F, %F
-
             %F, %F, %F, %F, %F
-
             %F, %F, %F, %F, %T];
-
         </programlisting>
-
         <para>
-
             <emphasis>#0#</emphasis> は <emphasis>1;1;0;1</emphasis>を有します.
-
         </para>
-
         <para>
-
             <emphasis>#1#</emphasis> は <emphasis>3;1;5</emphasis>を有します.
-
         </para>
-
         <para>
-
             論理値疎行列を再生するために必要な情報は2つのみです.
-
         </para>
-
         <para>HDFデータ型マッピング:</para>
-
         <para>32ビット整数</para>
-
         <para>
-
             <emphasis role="bold">Double</emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab 型:</emphasis> double
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis> SCILAB_Class = double
-
         </para>
-
         <para>
-
             <emphasis role="strong">ルートデータセットの値:</emphasis>
-
             実数および複素数の値は共に<literal>#&lt;variable name&gt;#</literal>と
-
             呼ばれるグループに保存されます.
-
         </para>
-
         <para>
-
             最初の値: 実数値へのリファレンス. 名前は<literal>#0#</literal>.
-
         </para>
-
         <para>
-
             行列が複素数の場合, 2番目の値は複素数の値へのリファレンスとなります. 名前は<literal>#1#</literal>.
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF データ型マッピング:</emphasis> 64-bit floating-point
-
         </para>
-
         <para>
-
             <emphasis role="bold">多項式</emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab 型:</emphasis> polynomial
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis> SCILAB_Class = polynomial
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 属性: </emphasis>
-
         </para>
-
         <para>SCILAB_Class = polynomial</para>
-
         <para>SCILAB_varname = &lt;string&gt;</para>
-
         <para>シンボル変数の名前</para>
-
         <para>
-
             <emphasis>SCILAB_Complex = &lt;boolean&gt;</emphasis>
-
         </para>
-
         <para>多項式が複素数の場合 (そうでない場合は設定されません)</para>
-
         <para>
-
             <emphasis role="strong">ルートデータセットの値:</emphasis>
-
         </para>
-
         <para>
-
             係数はdoubleの行列の形式で(double記憶領域の関連部分に)保存されます.
-
             係数は,複素数にできるため,複素数の行列に保存されることに注意してください.
-
             (サブ)グループとデータセットの命名規則は
-
             本章の先頭に記述されています.
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF データ型マッピング:</emphasis> Object reference
-
         </para>
-
         <para>
-
             <emphasis role="bold">list</emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab 型:</emphasis> list
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis>
-
         </para>
-
         <para>SCILAB_Class = list</para>
-
         <para>
-
             <emphasis role="strong">HDF5 属性:</emphasis> SCILAB_items = &lt;リストの要素数&gt;
-
         </para>
-
         <para>
-
             <emphasis role="strong">ルートデータセットの値:</emphasis>
-
         </para>
-
         <para>
-
             ルートデータセットに関連して,このデータセットで保存される値は
-
             リストに保存された値へのリファレンスです.
-
             値は<literal>#&lt;variable name&gt;#</literal>と呼ばれるグループに保存されます.
-
             この <literal>#&lt;variable name&gt;#</literal> グループにおいて,
-
             データは任意の型とすることができます.
-
             これらはグループに直線的に保存されます.
-
             その表現は他の場合と同様で,再帰的な構造にもとづきます
-
             (種々の型のリストのリストのリストが保存および読込みできることを意味します).
-
         </para>
-
         <para>
-
             (サブ)グループとデータセットの命名規則は本章の先頭に記述されています.
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF データ型マッピング:</emphasis> Object reference
-
         </para>
-
         <para>
-
             <emphasis role="bold">tlist </emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab型:</emphasis> tlist
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis>
-
         </para>
-
         <para> SCILAB_Class = tlist</para>
-
         <para>
-
             <emphasis role="strong">HDF5 属性:</emphasis> cf list
-
         </para>
-
         <para>
-
             <emphasis role="bold">mlist </emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab type:</emphasis> mlist
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis>
-
         </para>
-
         <para>SCILAB_Class = mlist</para>
-
         <para>
-
             <emphasis role="strong">HDF5 attributes:</emphasis> cf list
-
         </para>
-
         <para>
-
             <emphasis role="bold">void </emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab型:</emphasis> void
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis>
-
         </para>
-
         <para>SCILAB_Class = void</para>
-
         <para>
-
             void値はlist, tlistおよびmlistの非常に特殊な使用法でのみ
-
             現れます.
-
             以下の構文で作成することができます:
-
         </para>
-
         <programlisting>voidelement_ref=list(1,,3);</programlisting>
-
         <para>
-
             <emphasis role="bold">undefined </emphasis>
-
         </para>
-
         <para>
-
             <emphasis role="strong">Scilab 型:</emphasis> undefined
-
         </para>
-
         <para>
-
             <emphasis role="strong">HDF5 Scilab 型属性:</emphasis>
-
         </para>
-
         <para> SCILAB_Class = undefined</para>
-
         <para>
-
             undefined 値はリストの大きさが増加し, いくつかの要素が未定義となった
-
             場合に生成されます.
-
             これらは以下の構文で生成されます:
-
         </para>
-
         <programlisting>
-
             undefinedelement_ref=list(2,%i,'f',ones(3,3));
-
             undefinedelement_ref(6)="toto"
-
         </programlisting>
-
     </refsection>
-
     <refsection>
-
         <title>実際の例</title>
-
         <para>
-
             これらの変数全てについてサンプルファイルがScilabディストリビューションで
-
             提供されています.
-
             これらは,以下のディレクトリで入手可能です:
-
             <emphasis>SCI/modules/hdf5/tests/sample_scilab_data/</emphasis>
-
         </para>
-
         <para>
-
             本文書の編集時点で,
-
             以下のファイルがScilabディストリビューションで提供されています:
-
         </para>
-
         <emphasis role="italic">
-
             <para>
-
                 booleanmatrix.sod
-
             </para>
-
             <para>booleanscalar.sod
-
             </para>
-
             <para>booleansparse.sod
-
             </para>
-
             <para>emptymatrix.sod
-
             </para>
-
             <para>emptysparse.sod
-
             </para>
-
             <para>hypermatrixcomplex.sod
-
             </para>
-
             <para>hypermatrix.sod
-
             </para>
-
             <para>int16.sod
-
             </para>
-
             <para>int32.sod
-
             </para>
-
             <para>int8.sod
-
             </para>
-
             <para>listnested.sod
-
             </para>
-
             <para>list.sod
-
             </para>
-
             <para>matricedoublecomplexscalar.sod
-
             </para>
-
             <para>matricedoublecomplex.sod
-
             </para>
-
             <para>matricedoublescalar.sod
-
             </para>
-
             <para>matricedouble.sod
-
             </para>
-
             <para>matricestringscalar.sod
-
             </para>
-
             <para>matricestring.sod
-
             </para>
-
             <para>mlist.sod
-
             </para>
-
             <para>polynomialscoef.sod
-
             </para>
-
             <para>polynomials.sod
-
             </para>
-
             <para>sparsematrix.sod
-
             </para>
-
             <para>tlist.sod
-
             </para>
-
             <para>uint16.sod
-
             </para>
-
             <para>uint32.sod
-
             </para>
-
             <para>uint8.sod
-
             </para>
-
             <para>undefinedelement.sod
-
             </para>
-
             <para>voidelement.sod
-
             </para>
-
         </emphasis>
-
     </refsection>
-
     <refsection>
-
         <title>フォーマットの進化</title>
-
         <informaltable border="1">
-
             <tbody>
-
                 <tr>
-
                     <td align="justify">
-
                         <emphasis role="bold">SOD バージョン</emphasis>
-
                     </td>
-
                     <td align="justify">
-
                         <emphasis role="bold">Scilab バージョン</emphasis>
-
                     </td>
-
                     <td align="justify">
-
                         <emphasis role="bold">説明</emphasis>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td align="justify">
-
                         <para>0</para>
-
                     </td>
-
                     <td align="justify">
-
                         <para>5.2.0</para>
-
                     </td>
-
                     <td align="justify">
-
                         <para>Scilab/HDF5 形式の最初のバージョン</para>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td align="justify">
-
                         <para>1</para>
-
                     </td>
-
                     <td align="justify">
-
                         <para>5.4.0 alpha / beta</para>
-
                     </td>
-
                     <td align="left">
-
                         <para>読込み/保存のデフォルト形式</para>
-
                         <para>前の形式 (.bin) はまだサポートされます</para>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td>
-
                         <para>2</para>
-
                     </td>
-
                     <td>
-
                         <para>5.4.0</para>
-
                     </td>
-
                     <td>
-
                         <para>
-
                             double, 整数, 多項式および文字列について,
-
                             多次元 HDF5 を使用するため,
-
                             <emphasis>SCILAB_cols</emphasis> / <emphasis>SCILAB_rows</emphasis>
-
                             が削除されました.
-
                         </para>
-
                     </td>
-
                 </tr>
-
                 <tr>
-
                     <td align="justify">
 
-
-
                     </td>
-
                     <td align="justify">
-
                         <para>6.0.0 (将来)</para>
-
                     </td>
-
                     <td align="justify">
-
                         <para>.bin サポートを廃止.</para>
-
                     </td>
-
                 </tr>
-
             </tbody>
-
         </informaltable>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="save">save</link>
-
             </member>
-
             <member>
-
                 <link linkend="load">load</link>
-
             </member>
-
             <member>
-
                 <link linkend="listvarinfile">listvarinfile</link>
-
             </member>
-
             <member>
-
                 <link linkend="type">type</link>
-
             </member>
-
             <member>
-
                 <link linkend="typeof">typeof</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
 </refentry>
-
index b10c844..d624d4f 100644 (file)
         <para>
             Несколько "типов" основаны на <emphasis>tlist</emphasis> или
             <emphasis>mlist</emphasis>. Это <emphasis>rational</emphasis>,
-            <emphasis>state-space</emphasis>, <emphasis>hypermat</emphasis>,
+            <emphasis>state-space</emphasis>,
             <emphasis>cell</emphasis> и <emphasis>struct</emphasis>.
             Следовательно, они явно сохраняются.
         </para>
index d07964d..680de12 100644 (file)
@@ -2,25 +2,32 @@
 <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="macr2tree">
     <refnamediv>
         <refname>macr2tree</refname>
-        <refpurpose>function to tree conversion</refpurpose>
+        <refpurpose>provides the internal code of a compiled Scilab function</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>t=macr2tree(function_name)</synopsis>
+        <synopsis>p = macr2tree(function)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>function_name</term>
+                <term>function</term>
                 <listitem>
-                    <para>a Scilab macro</para>
+                    <para>handle of a Scilab macro (not its name as a string)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>t</term>
+                <term>p</term>
                 <listitem>
-                    <para>a Scilab "tree"</para>
+                    <para>List of type <literal>program</literal> with the fields
+                    <literal>p.name</literal>, <literal>p.nblines</literal>,
+                    <literal>p.inputs</literal>, <literal>p.outputs</literal>, and
+                    <literal>p.statements</literal>. The 3 last ones are nested lists
+                    describing the internal code of the <literal>function</literal>.
+                    The output of <function>macr2tree</function> is usually
+                    used to feed <function>tree2code(..)</function>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -28,7 +35,7 @@
     <refsection>
         <title>Description</title>
         <para>
-            This primitive converts a compiled Scilab function <literal>function_name</literal>
+            This primitive converts a compiled Scilab <literal>function</literal>
             into a tree (nested tlists)  which codes the internal representation of
             the function. For use with <literal>tree2code</literal>.
         </para>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
+prog = macr2tree(log2);   // Note that the input is log2, not "log2"
+typeof(prog)
+fieldnames(prog)'
+prog.name
+deftxt = tree2code(prog, %T);
+printf("%s\n", deftxt);
  ]]></programlisting>
+    <screen><![CDATA[--> typeof(prog)
+ ans  =
+ program
+
+--> fieldnames(prog)'
+ ans  =
+!name  outputs  inputs  statements  nblines  !
+
+--> prog.name
+ ans  =
+ log2
+
+--> deftxt = tree2code(prog, %T);
+
+--> printf("%s\n", deftxt);
+function [f,e] = log2(x)
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
@@ -47,6 +85,12 @@ write(%io(2),txt,'(a)');
             <member>
                 <link linkend="tree2code">tree2code</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="functions">functions</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 35a28bd..eb4754c 100644 (file)
                 <td>
                     <literal>hypermat</literal>
                 </td>
-                <td/>
+                <td>Obsolete. Will be removed from Scilab 6.
+                    The code of the hypermat contents must be targeted instead.
+                </td>
             </tr>
             <tr>
                 <td>pointer</td>
index f2a144d..0490bd4 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA -
+ * Copyright (C) 2016 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="tree2code">
+<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="tree2code">
     <refnamediv>
         <refname>tree2code</refname>
-        <refpurpose>generates ASCII definition of a Scilab function</refpurpose>
+        <refpurpose>generates the text definition of a Scilab function from its internal code</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
@@ -29,7 +33,7 @@
                 <term>tree</term>
                 <listitem>
                     <para>
-                        a macro tree (coming from <function>macr2tree</function>).
+                        a macro internal tree (coming from <function>macr2tree</function>).
                     </para>
                 </listitem>
             </varlistentry>
                 <term>prettyprint</term>
                 <listitem>
                     <para>an optional boolean value:</para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>%T</term>
-                            <listitem>
-                                <para>generated code is indented and beautified</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>%F</term>
-                            <listitem>
-                                <para>
-                                    generated code is not beautified (default)
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
+                    <table>
+                      <tr>
+                        <td>%T : </td>
+                        <td>The generated code is indented and beautified</td>
+                      </tr>
+                      <tr>
+                        <td>%F : </td>
+                        <td>The generated code is not beautified (default)</td>
+                      </tr>
+                    </table>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>txt</term>
                 <listitem>
-                    <para>a column vector of strings, the text giving the Scilab instructions.</para>
+                    <para>column of texts: Scilab instructions defining the function</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Description</title>
         <para>
-            Given a loaded Scilab function "tree" (returned by <function>macr2tree</function>), <function>tree2code</function> allows to
-            re-generate the code.
+            Given a loaded Scilab function "tree" (returned by <function>macr2tree</function>),
+            <function>tree2code</function> allows to re-generate the code defining the function.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
+tree = macr2tree(log2);   // note that the input is log2 (the function handle), not "log2"
+txt = tree2code(tree, %T);
+printf("%s\n", txt);
  ]]></programlisting>
+    <screen><![CDATA[--> printf("%s\n",c)
+function [f,e] = log2(x)
+  // x may be positive, negative, or complex
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end;
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
@@ -84,6 +97,12 @@ write(%io(2),txt,'(a)');
             <member>
                 <link linkend="macr2tree">macr2tree</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="string">string</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index f8ff196..2cfcd60 100644 (file)
@@ -64,15 +64,11 @@ function foo(varargin)
     disp([varargin(1),varargin(2)])
 endfunction
         ]]></programlisting>
-        <screen>
-            -->foo(a=1,b=2)
-
-            1.    2.
-
-            -->foo(b=1,a=2)
-
-            1.    2.
-        </screen>
+        <screen><![CDATA[--> foo(a=1, b=2)
+ 1.    2.
+--> foo(b=1, a=2)
+ 1.    2.
+]]></screen>
         <para>
             Result is the same, but the arguments were inverted.
         </para>
index 414ffea..0861982 100644 (file)
@@ -2,25 +2,32 @@
 <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="macr2tree">
     <refnamediv>
         <refname>macr2tree</refname>
-        <refpurpose>conversion d'une fonction en arbre</refpurpose>
+        <refpurpose>fournit le code interne d'une fonction compilée en Scilab</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>t=macr2tree(nom-de-fonction)</synopsis>
+        <synopsis>p = macr2tree(fonction)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
-                <term>nom-de-fonction</term>
+                <term>fonction</term>
                 <listitem>
-                    <para>une macro Scilab</para>
+                    <para>identifiant direct d'une fonction compilée écrite en
+                    Scilab (NON son nom sous forme texte)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>t</term>
+                <term>p</term>
                 <listitem>
-                    <para>un "arbre" Scilab</para>
+                    <para>Liste de type <literal>program</literal> avec les champs
+                    <literal>p.name</literal>, <literal>p.nblines</literal>,
+                    <literal>p.inputs</literal>, <literal>p.outputs</literal>, et
+                    <literal>p.statements</literal>. Les 3 derniers sont des
+                    listes imbriquées décrivant le code interne de la
+                    <literal>fonction</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Description</title>
         <para>
-            Cette primitive convertit une fonction compilée de Scilab <literal>nom-de-fonction</literal>
-            en arbre (tlists imbriquées) qui code la représentation interne de la fonction.
-            A utiliser avec <literal>tree2code</literal>.
+            Cette primitive convertit une <literal>fonction</literal> compilée
+            de Scilab en un arbre (tlists imbriquées)
+            représentant le code interne de la fonction.
+            A utiliser avec <literal>tree2code()</literal>.
         </para>
     </refsection>
     <refsection>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
+prog = macr2tree(log2);   // Noter que l'entrée est log2, non "log2"
+typeof(prog)
+fieldnames(prog)'
+prog.name
+deftxt = tree2code(prog, %T);
+printf("%s\n", deftxt);
  ]]></programlisting>
+    <screen><![CDATA[--> typeof(prog)
+ ans  =
+ program
+
+--> fieldnames(prog)'
+ ans  =
+!name  outputs  inputs  statements  nblines  !
+
+--> prog.name
+ ans  =
+ log2
+
+--> deftxt = tree2code(prog, %T);
+
+--> printf("%s\n", deftxt);
+function [f,e] = log2(x)
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
@@ -47,6 +86,12 @@ write(%io(2),txt,'(a)');
             <member>
                 <link linkend="tree2code">tree2code</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="functions">functions</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 7d5a734..787da29 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="macr2tree">
-
     <refnamediv>
-
         <refname>macr2tree</refname>
-
         <refpurpose>ツリー変換用の関数</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
-        <synopsis>t=macr2tree(function-name)</synopsis>
-
+        <synopsis>p = macr2tree(function)</synopsis>
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
-                <term>function-name</term>
-
+                <term>function</term>
                 <listitem>
-
-                    <para>cilabマクロ</para>
-
+                    <para>handle of a Scilab macro (not its name as a string)</para>
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
-                <term>t</term>
-
+                <term>p</term>
                 <listitem>
-
-                    <para>Scilab "ツリー"</para>
-
+                    <para>List of type <literal>program</literal> with the fields
+                    <literal>p.name</literal>, <literal>p.nblines</literal>,
+                    <literal>p.inputs</literal>, <literal>p.outputs</literal>, and
+                    <literal>p.statements</literal>. The 3 last ones are nested lists
+                    describing the internal code of the <literal>function</literal>.
+                    </para>
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             このプリミティブは, コンパイル済みの Scilab 関数<literal>function-name</literal>
-
             を関数を内部表現にコード化したツリー (鱗状のtlists)に変換します.
-
-            <literal>tree2code</literal>と共に使用します.
-
+            <literal>tree2code()</literal>と共に使用します.
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
+prog = macr2tree(log2);   // Note that the input is log2, not "log2"
+typeof(prog)
+fieldnames(prog)'
+prog.name
+deftxt = tree2code(prog, %T);
+printf("%s\n", deftxt);
  ]]></programlisting>
-
+    <screen><![CDATA[--> typeof(prog)
+ ans  =
+ program
+
+--> fieldnames(prog)'
+ ans  =
+!name  outputs  inputs  statements  nblines  !
+
+--> prog.name
+ ans  =
+ log2
+
+--> deftxt = tree2code(prog, %T);
+
+--> printf("%s\n", deftxt);
+function [f,e] = log2(x)
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="tree2code">tree2code</link>
-
             </member>
-
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="functions">functions</link>
+            </member>
         </simplelist>
-
     </refsection>
-
 </refentry>
-
index 182dc18..085de83 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
  * along with this program.
  *
  -->
-
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="overloading" xml:lang="ja">
-
     <refnamediv>
-
         <refname>overloading</refname>
-
         <refpurpose>表示,関数および演算子オーバーロード機能</refpurpose>
-
     </refnamediv>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             Scilabにおいては, 変数表示, 関数および演算子は
-
             関数(Scilabコードまたはプリミティブ)により新規オブジェクト用に
-
             定義することができます.
-
         </para>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>表示</term>
-
                 <listitem>
-
                     <para>
-
                         <literal>tlist</literal>により定義される 新規オブジェクトの表示は,
-
                         オーバーロードすることができます
-
                         (デフォルトの表示は<literal>list</literal>の出力に似ています).
-
                         オーバーロード関数は入力引数を1つとし,出力引数を持たない必要があります.
-
                         その関数の名前は,<literal>%&lt;tlist_type&gt;_p</literal>のように 作成します.
-
                         ただし,
-
                         <literal>%&lt;tlist_type&gt;</literal> は,
-
                         <literal>tlist</literal>型の要素の最初のエントリを
-
                         最初の9文字に丸めたものを意味します.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>演算子</term>
-
                 <listitem>
-
                     <para>
-
                         指定したオペランド型について定義されていない各演算子を定義することができます.
-
                         オーバーロード関数は入力引数を1つ,オペランドの数に基づき 1個または
-
                         2個の入力を有する必要があります.
-
                         関数名は以下のように作成されます:
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
         <para>2項演算子の場合:
-
             <literal>%&lt;first_operand_type&gt;_&lt;op_code&gt;_&lt;second_operand_type&gt;</literal>
-
         </para>
-
         <para>単項演算子の場合:
-
             <literal>%&lt;operand_type&gt;_&lt;op_code&gt;</literal>
-
         </para>
-
         <para>n項演算子の展開および挿入は以下のように記述されます.</para>
-
         <warning>
-
             <function>typename</function>関数に登録された型のみが
-
             オーバーロードマクロの中で使用できることに注意してください.
-
         </warning>
-
         <para>
-
             <literal>&lt;operand_type&gt;</literal>,
-
             <literal>&lt;first_operand_type&gt;</literal>,
-
             <literal>&lt;second_operand_type&gt;</literal> は,
-
             以下のテーブルに記述された各データ型に関連する文字シーケンスです:
-
         </para>
-
         <informaltable border="1">
-
             <tr>
-
                 <td>データ型</td>
-
                 <td>文字コード</td>
-
                 <td>typeof</td>
-
                 <td>コメント</td>
-
             </tr>
-
             <tr>
-
                 <td>double行列</td>
-
                 <td>
-
                     <literal>s</literal>
-
                 </td>
-
                 <td>
-
                     <literal>定数</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>多項式行列</td>
-
                 <td>
-
                     <literal>p</literal>
-
                 </td>
-
                 <td>
-
                     <literal>多項式</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>論理値行列</td>
-
                 <td>
-
                     <literal>b</literal>
-
                 </td>
-
                 <td>
-
                     <literal>論理値</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>疎行列</td>
-
                 <td>
-
                     <literal>sp</literal>
-
                 </td>
-
                 <td>
-
                     <literal>疎行列</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>論理値疎行列</td>
-
                 <td>
-
                     <literal>spb</literal>
-
                 </td>
-
                 <td>
-
                     <literal>論理値疎行列</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>Matlab 疎行列</td>
-
                 <td>
-
                     <literal>msp</literal>
-
                 </td>
-
                 <td>
-
                     <literal>Matlab疎行列</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>整数行列</td>
-
                 <td>
-
                     <literal>i</literal>
-
                 </td>
-
                 <td>
-
                     <literal>int8, int16, int32, uint8, uint16, uint32</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>文字列行列</td>
-
                 <td>
-
                     <literal>c</literal>
-
                 </td>
-
                 <td>
-
                     <literal>文字列</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>ハンドル</td>
-
                 <td>
-
                     <literal>h</literal>
-
                 </td>
-
                 <td>
-
                     <literal>ハンドル</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>コンパイルされた関数</td>
-
                 <td>
-
                     <literal>fptr</literal>
-
                 </td>
-
                 <td>
-
                     <literal>fptr</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>スクリプト関数</td>
-
                 <td>
-
                     <literal>mc</literal>
-
                 </td>
-
                 <td>
-
                     <literal>関数</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>ライブラリ</td>
-
                 <td>
-
                     <literal>l</literal>
-
                 </td>
-
                 <td>
-
                     <literal>ライブラリ</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>リスト</td>
-
                 <td>
-
                     <literal>l</literal>
-
                 </td>
-
                 <td>
-
                     <literal>リスト</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>tlist</td>
-
                 <td>
-
                     <literal>tlist型</literal>
-
                 </td>
-
                 <td>
-
                     <literal>tlist型</literal>
-
                 </td>
-
                 <td>最初のtlistエントリの最初の文字列</td>
-
             </tr>
-
             <tr>
-
                 <td>mlist</td>
-
                 <td>
-
                     <literal>mlist型</literal>
-
                 </td>
-
                 <td>
-
                     <literal>mlist型</literal>
-
                 </td>
-
                 <td>最初のmlistエントリの最初の文字列</td>
-
             </tr>
-
             <tr>
-
                 <td>ハイパー行列</td>
-
                 <td>
-
                     <literal>hm</literal>
-
                 </td>
-
                 <td>
-
                     <literal>hypermat</literal>
-
                 </td>
-
-                <td/>
-
+                <td>Obsolete. Will be removed from Scilab 6.
+                    The code of the hypermat contents must be targeted instead.
+                </td>
             </tr>
-
             <tr>
-
                 <td>ポインタ</td>
-
                 <td>
-
                     <literal>ptr</literal>
-
                 </td>
-
                 <td>
-
                     <literal>ポインタ</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>セル</td>
-
                 <td>
-
                     <literal>ce</literal>
-
                 </td>
-
                 <td>
-
                     <literal>ce</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>structure</td>
-
                 <td>
-
                     <literal>st</literal>
-
                 </td>
-
                 <td>
-
                     <literal>st</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>有理数</td>
-
                 <td>
-
                     <literal>r</literal>
-
                 </td>
-
                 <td>
-
                     <literal>有理数</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>線形状態空間</td>
-
                 <td>
-
                     <literal>lss</literal>
-
                 </td>
-
                 <td>
-
                     <literal>状態空間</literal>
-
                 </td>
-
                 <td/>
-
             </tr>
-
             <tr>
-
                 <td>暗黙の多項式</td>
-
                 <td>
-
                     <literal>ip</literal>
-
                 </td>
-
                 <td>
-
                     <literal>size implicit</literal>
-
                 </td>
-
                 <td>1:1:$</td>
-
             </tr>
-
         </informaltable>
-
         <para>
-
             <literal>&lt;op_code&gt;</literal> は, 以下のテーブルに記述された
-
             各演算子に関連する文字です:
-
         </para>
-
         <informaltable border="1">
-
             <tr>
-
                 <td>
-
                     <literal>op</literal>
-
                 </td>
-
                 <td>char code</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>'</literal>
-
                 </td>
-
                 <td>t</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>+</literal>
-
                 </td>
-
                 <td>a</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>-</literal>
-
                 </td>
-
                 <td>s</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>*</literal>
-
                 </td>
-
                 <td>m</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>/</literal>
-
                 </td>
-
                 <td>r</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>\</literal>
-
                 </td>
-
                 <td>l</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>^</literal>
-
                 </td>
-
                 <td>p</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>.*</literal>
-
                 </td>
-
                 <td>x</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>./</literal>
-
                 </td>
-
                 <td>d</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>.\</literal>
-
                 </td>
-
                 <td>q</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>.*.</literal>
-
                 </td>
-
                 <td>k</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>./.</literal>
-
                 </td>
-
                 <td>y</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>.\.</literal>
-
                 </td>
-
                 <td>z</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>:</literal>
-
                 </td>
-
                 <td>b</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>*.</literal>
-
                 </td>
-
                 <td>u</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>/.</literal>
-
                 </td>
-
                 <td>v</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>\.</literal>
-
                 </td>
-
                 <td>w</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>[a,b]</literal>
-
                 </td>
-
                 <td>c</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>[a;b]</literal>
-
                 </td>
-
                 <td>f</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>() extraction</literal>
-
                 </td>
-
                 <td>e</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>() insertion</literal>
-
                 </td>
-
                 <td>i</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>==</literal>
-
                 </td>
-
                 <td>o</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>&lt;&gt;</literal>
-
                 </td>
-
                 <td>n</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>|</literal>
-
                 </td>
-
                 <td>g</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>&amp;</literal>
-
                 </td>
-
                 <td>h</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>.^</literal>
-
                 </td>
-
                 <td>j</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>.'</literal>
-
                 </td>
-
                 <td>0</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>&lt;</literal>
-
                 </td>
-
                 <td>1</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>&gt;</literal>
-
                 </td>
-
                 <td>2</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>&lt;=</literal>
-
                 </td>
-
                 <td>3</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>&gt;=</literal>
-
                 </td>
-
                 <td>4</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>~</literal>
-
                 </td>
-
                 <td>5</td>
-
             </tr>
-
             <tr>
-
                 <td>
-
                     <literal>iext</literal>
-
                 </td>
-
                 <td>6</td>
-
             </tr>
-
         </informaltable>
-
         <para>
-
             展開構文<literal>b=a(i1,...,in)</literal>の オーバーロード関数は,
-
             以下のような呼び出し手順となります:
-
             <literal>b=%&lt;type_of_a&gt;_e_(i1,...,in,a)</literal>
-
         </para>
-
         <para>
-
             そして,構文 <literal>[x1,..,xm]=a(i1,...,in)</literal> は
-
             以下のような呼び出し手順となります:
-
             <literal>[x1,..,xm]=%&lt;type_of_a&gt;_e_(i1,...,in,a)</literal>
-
         </para>
-
         <para>
-
             挿入構文に関するオーバーロード関数 <literal>a(i1,...,in)=b</literal>
-
             は以下のような呼び出し手順となります:
-
             <literal>a=%&lt;type_of_b&gt;_i_&lt;type_of_a&gt;(i1,...,in,b,a)</literal>.
-
         </para>
-
         <para>
-
             文字コード<literal>6</literal> を
-
             <code>x.b(2) = 33</code>のような複雑な挿入アルゴリズム で使用することができます.
-
             ただし,<literal>b</literal>フィールドは構造体<literal>x</literal>で 定義されません.
-
             挿入は自動的に<literal>temp=x.b;</literal> <code>temp(2) = 33</code>;
-
             <code>x.b = temp</code>に分解されます. 文字コード<literal>6</literal>
-
             がこのアルゴリズムの最初の手順で 使用されます.オーバーロード関数<literal>6</literal> は,
-
             <literal>e</literal>のものに非常によく似ています.
-
         </para>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>関数 :</term>
-
                 <listitem>
-
                     <para>
-
                         いくつかの基本プリミティブ関数新規データ型に関してオーバーロードができます.
-
                         特定のデータ型に関してこのような関数が未定義の場合,
-
                         関数<literal>%&lt;type_of_an_argument&gt;_&lt;function_name&gt;</literal>
-
                         がコールされます. ユーザはこのコールされた関数に入力データ型に関する
-
                         定義を追加することができます.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
     </refsection>
-
     <refsection>
-
         <programlisting role="example">//表示
-
             var = tlist('tab', ['a', 'b'], ['x'; 'y'], rand(2, 2)) // varの型は 'tab'です
 
-
-
             typeof(var)
 
-
-
             function [] = %tab_p(l)
-
             disp([[' '; l(3)] [l(2); string(l(4))]])
-
             endfunction
 
-
-
             var // オーバーローディング後
-
         </programlisting>
-
     </refsection>
-
     <refsection>
-
         <programlisting role="example">//演算子
-
             's' + 1 // 数値は文字列に加算できません
 
-
-
             function x = %c_a_s(a, b)
-
             x = a + string(b);
-
             endfunction
 
-
-
             's' + 1 // オーバーローディング後
-
         </programlisting>
-
     </refsection>
-
     <refsection>
-
         <programlisting role="example">//関数
-
             sin('2 * x') // sin関数は文字列では動作しません
 
-
-
             function x = %c_sin(a)
-
             x = 'sin(' + a + ')'
-
             endfunction
 
-
-
             sin('2 * x') // オーバーローディング後
-
         </programlisting>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="tlist">tlist</link>
-
             </member>
-
             <member>
-
                 <link linkend="disp">disp</link>
-
             </member>
-
             <member>
-
                 <link linkend="symbols">symbols</link>
-
             </member>
-
             <member>
-
                 <link linkend="typeof">typeof</link>
-
             </member>
-
             <member>
-
                 <link linkend="type">type</link>
-
             </member>
-
             <member>
-
                 <link linkend="typename">typename</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
 </refentry>
-
index 79bb017..185a37d 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA -
  * along with this program.
  *
  -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="tree2code">
-
+<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="tree2code">
     <refnamediv>
-
         <refname>tree2code</refname>
-
         <refpurpose>Scilab関数のアスキー定義を生成する</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>txt = tree2code(tree, prettyprint)</synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>tree</term>
-
                 <listitem>
-
                     <para>
-
                         マクロツリー (<function>macr2tree</function>の出力)
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>prettyprint</term>
-
                 <listitem>
-
                     <para>オプションの論理値</para>
-
-                    <variablelist>
-
-                        <varlistentry>
-
-                            <term>%T</term>
-
-                            <listitem>
-
-                                <para>生成されるコードはインデント,整形されます</para>
-
-                            </listitem>
-
-                        </varlistentry>
-
-                        <varlistentry>
-
-                            <term>%F</term>
-
-                            <listitem>
-
-                                <para>生成されるコードは整形されません (デフォルト)</para>
-
-                            </listitem>
-
-                        </varlistentry>
-
-                    </variablelist>
-
+                    <table>
+                      <tr>
+                        <td>%T : </td>
+                        <td>生成されるコードはインデント,整形されます</td>
+                      </tr>
+                      <tr>
+                        <td>%F : </td>
+                        <td>生成されるコードは整形されません (デフォルト)</td>
+                      </tr>
+                    </table>
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>txt</term>
-
                 <listitem>
-
                     <para>文字列の列ベクトルで, Scilab命令を指定するテキスト</para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             読み込まれたScilab関数 "ツリー" (<function>macr2tree</function>の出力)を
-
             指定することで, <function>tree2code</function>
-
             によりコードを再生成することができます.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
- ]]></programlisting>
-
+tree = macr2tree(log2);   // note that the input is log2 (the function handle), not "log2"
+txt = tree2code(tree, %T);
+printf("%s\n", txt);
+       ]]></programlisting>
+    <screen><![CDATA[--> printf("%s\n",c)
+function [f,e] = log2(x)
+  // x may be positive, negative, or complex
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end;
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="macr2tree">macr2tree</link>
-
             </member>
-
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="string">string</link>
+            </member>
         </simplelist>
-
     </refsection>
-
 </refentry>
-
+>>>>>>> 1c1cb3e... help pages: misc. typos, fixes and short improvements
index 96984f3..46f8fa2 100644 (file)
@@ -68,12 +68,11 @@ function foo(varargin)
     disp([varargin(1),varargin(2)])
 endfunction
         ]]></programlisting>
-        <screen>
-            -->foo(a=1,b=2)
-            1.    2.
-            -->foo(b=1,a=2)
-            1.    2.
-        </screen>
+        <screen><![CDATA[--> foo(a=1, b=2)
+ 1.    2.
+--> foo(b=1, a=2)
+ 1.    2.
+]]></screen>
         <para>結果は同じですが, 引数は逆になります.</para>
     </refsection>
     <refsection>
index afe5f35..270fa06 100644 (file)
@@ -1,52 +1,97 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="macr2tree" xml:lang="pt">
+<?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="macr2tree" xml:lang="pt">
     <refnamediv>
         <refname>macr2tree</refname>
-        <refpurpose>conversão de função para árvore</refpurpose>
+        <refpurpose>fornece o código interno de uma função Scilab compilada</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>t=macr2tree(function-name)</synopsis>
+        <title>Seqüência de Chamamento</title>
+        <synopsis>p = macr2tree(macro)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
-                <term>function-name</term>
+                <term>macro</term>
                 <listitem>
-                    <para>macro do Scilab</para>
+                    <para>handle of a Scilab macro (NOT its name as a string)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>t</term>
+                <term>p</term>
                 <listitem>
-                    <para>uma "árvore" do Scilab</para>
+                    <para>List of type <literal>program</literal> with the fields
+                    <literal>p.name</literal>, <literal>p.nblines</literal>,
+                    <literal>p.inputs</literal>, <literal>p.outputs</literal>, and
+                    <literal>p.statements</literal>. The 3 last ones are nested lists
+                    describing the internal code of the <literal>macro</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
-        <para>Esta primitiva converte uma função Scilab compilada
-            <literal>function-name</literal> em uma árvore (tlistas imbricadas) que
-            codifica a representação interna da função. Deve ser usada com
-            <literal>tree2code</literal>.
+        <title>Descrição</title>
+        <para>Esta primitiva converte uma função Scilab compilada
+            <literal>function-name</literal> em uma árvore (tlistas imbricadas) que
+            codifica a representação interna da função. Deve ser usada com
+            <literal>tree2code()</literal>.
         </para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
+prog = macr2tree(log2);   // Note that the input is log2, not "log2"
+typeof(prog)
+fieldnames(prog)'
+prog.name
+deftxt = tree2code(prog, %T);
+printf("%s\n", deftxt);
  ]]></programlisting>
+    <screen><![CDATA[--> typeof(prog)
+ ans  =
+ program
+
+--> fieldnames(prog)'
+ ans  =
+!name  outputs  inputs  statements  nblines  !
+
+--> prog.name
+ ans  =
+ log2
+
+--> deftxt = tree2code(prog, %T);
+
+--> printf("%s\n", deftxt);
+function [f,e] = log2(x)
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="tree2code">tree2code</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="functions">functions</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index ea24d7f..9d8fa40 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA -
 <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="tree2code" xml:lang="pt">
     <refnamediv>
         <refname>tree2code</refname>
-        <refpurpose>gera a definição ASCII de uma função Scilab</refpurpose>
+        <refpurpose>gera a definição ASCII de uma função Scilab</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>txt = tree2code(tree, prettyprint)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>tree</term>
                 <listitem>
                     <para>
-                        uma árvore macro (vinda de <function>macr2tree</function>)
+                        uma árvore macro (vinda de <function>macr2tree</function>)
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>prettyprint</term>
                 <listitem>
-                    <para>valor opcional booleano</para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>%T</term>
-                            <listitem>
-                                <para>o código gerado é identado e embelezado</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>%F</term>
-                            <listitem>
-                                <para>o código gerado não é embelezado (padrão)</para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
+                    <para>valor opcional booleano :</para>
+                    <table>
+                      <tr>
+                        <td>%T : </td>
+                        <td>o código gerado é identado e embelezado</td>
+                      </tr>
+                      <tr>
+                        <td>%F : </td>
+                        <td>o código gerado não é embelezado (padrão)</td>
+                      </tr>
+                    </table>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>txt</term>
                 <listitem>
-                    <para>um vetor coluna de strings, o texto fornecendo as instruções
+                    <para>coluna de strings, o texto fornecendo as instruções
                         Scilab
                     </para>
                 </listitem>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
-            Dada uma função Scilab carregada "tree" (retornada por <function>macr2tree</function>),
-            <function>tree2code</function> permite gerar novamente o código.
+            Dada uma função Scilab carregada "tree" (retornada por <function>macr2tree</function>),
+            <function>tree2code</function> permite gerar novamente o código.
         </para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
- ]]></programlisting>
+tree = macr2tree(log2);   // note that the input is log2 (the function handle), not "log2"
+txt = tree2code(tree, %T);
+printf("%s\n", txt);
+    ]]></programlisting>
+    <screen><![CDATA[--> printf("%s\n",c)
+function [f,e] = log2(x)
+  // x may be positive, negative, or complex
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end;
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="macr2tree">macr2tree</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="string">string</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index ca6109a..e6ff107 100644 (file)
@@ -63,15 +63,11 @@ function foo(varargin)
     disp([varargin(1),varargin(2)])
 endfunction
         ]]></programlisting>
-        <screen>
-            -->foo(a=1,b=2)
-
-            1.    2.
-
-            -->foo(b=1,a=2)
-
-            1.    2.
-        </screen>
+        <screen><![CDATA[--> foo(a=1, b=2)
+ 1.    2.
+--> foo(b=1, a=2)
+ 1.    2.
+]]></screen>
         <para>O resultado é o mesmo, mas os argumentos foram invertidos.</para>
     </refsection>
     <refsection>
index f21ed65..b4dacf6 100644 (file)
@@ -2,25 +2,31 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="macr2tree">
     <refnamediv>
         <refname>macr2tree</refname>
-        <refpurpose>преобразование функции в дерево</refpurpose>
+        <refpurpose>Обеспечивает внутренний код скомпилированного функции Scilab</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>t=macr2tree(function_name)</synopsis>
+        <synopsis>p = macr2tree(function)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
-                <term>function_name</term>
+                <term>function</term>
                 <listitem>
-                    <para>макрос Scilab'а</para>
+                    <para>дескриптор сценария Scilab (НЕ его имя в виде строки)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>t</term>
+                <term>p</term>
                 <listitem>
-                    <para>"дерево" Scilab'а</para>
+                    <para>
+                    Список типа <literal>program</literal> с полями
+                    <literal>p.name</literal>, <literal>p.nblines</literal>,
+                    <literal>p.inputs</literal>, <literal>p.outputs</literal> и
+                    <literal>p.statements</literal>. Последние три являются вложенными списками,
+                    описывающими внутренний код <literal>function</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
             Этот примитив преобразует компилированную функцию Scilab с именем
             <literal>function_name</literal> в дерево (перекрываемые типизированные
             списки), которое кодирует внутреннее представление функции.
-            Для использования совместно с <literal>tree2code</literal>.
+            Для использования совместно с <literal>tree2code()</literal>.
         </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
+prog = macr2tree(log2);   // Заметьте, что на входе указано log2, а не "log2"
+typeof(prog)
+fieldnames(prog)'
+prog.name
+deftxt = tree2code(prog, %T);
+printf("%s\n", deftxt);
  ]]></programlisting>
+    <screen><![CDATA[--> typeof(prog)
+ ans  =
+ program
+
+--> fieldnames(prog)'
+ ans  =
+!name  outputs  inputs  statements  nblines  !
+
+--> prog.name
+ ans  =
+ log2
+
+--> deftxt = tree2code(prog, %T);
+
+--> printf("%s\n", deftxt);
+function [f,e] = log2(x)
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
@@ -48,6 +85,12 @@ write(%io(2),txt,'(a)');
             <member>
                 <link linkend="tree2code">tree2code</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="functions">functions</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 3436efd..a84be30 100644 (file)
                 <td>
                     <literal>hypermat</literal>
                 </td>
-                <td/>
+                <td>Устарело. Будет удалено из Scilab 6.
+                    Код содержимого гиперматрицы должен быть специализированным.
+                </td>
             </tr>
             <tr>
                 <td>указатель</td>
index c26c80e..e76ac38 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="tree2code">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ru" xml:id="tree2code">
     <refnamediv>
         <refname>tree2code</refname>
         <refpurpose>
                 <term>prettyprint</term>
                 <listitem>
                     <para>необязательное логическое значение:</para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>%T</term>
-                            <listitem>
-                                <para>
-                                    генерирует код, который имеет отступы и красивый вид;
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>%F</term>
-                            <listitem>
-                                <para>
-                                    генерируемый код не приукрашен (по умолчанию).
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
+                    <table>
+                      <tr>
+                        <td>%T : </td>
+                        <td>генерирует код, который имеет отступы и красивый вид</td>
+                      </tr>
+                      <tr>
+                        <td>%F : </td>
+                        <td>генерируемый код не приукрашен (по умолчанию)</td>
+                      </tr>
+                    </table>
                 </listitem>
             </varlistentry>
             <varlistentry>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-tree=macr2tree(cosh);
-txt=tree2code(tree,%T);
-write(%io(2),txt,'(a)');
- ]]></programlisting>
+tree = macr2tree(log2);   // заметьте, что на входе указано log2 (дескриптор функции), а не "log2"
+txt = tree2code(tree, %T);
+printf("%s\n", txt);
+       ]]></programlisting>
+    <screen><![CDATA[--> printf("%s\n",c)
+function [f,e] = log2(x)
+  // x may be positive, negative, or complex
+  [lhs,rhs] = argn(0)
+  if rhs<>1 then
+    msg = gettext("%s: Wrong number of input argument(s): %d expected.\n")
+    error(msprintf(msg, "log2", 1))
+  end;
+  if argn(1)==1 then
+    f = log(x)/log(2)
+  else
+    [f,e] = frexp(x)
+  end
+endfunction
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
@@ -91,6 +101,12 @@ write(%io(2),txt,'(a)');
             <member>
                 <link linkend="macr2tree">macr2tree</link>
             </member>
+            <member>
+                <link linkend="macrovar">macrovar</link>
+            </member>
+            <member>
+                <link linkend="string">string</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index 0559bd8..8fb89b6 100644 (file)
@@ -67,12 +67,11 @@ function foo(varargin)
     disp([varargin(1),varargin(2)])
 endfunction
         ]]></programlisting>
-        <screen>
-            -->foo(a=1,b=2)
-            1.    2.
-            -->foo(b=1,a=2)
-            1.    2.
-        </screen>
+        <screen><![CDATA[--> foo(a=1, b=2)
+ 1.    2.
+--> foo(b=1, a=2)
+ 1.    2.
+]]></screen>
         <para>
             Результат одинаковый, но аргументы были переставлены.
         </para>
index 29ad741..71c32a1 100644 (file)
         <para>
             If <literal>x</literal> is a vector and <literal>y</literal> a
             matrix plot2d(x,y,&lt;opt_args&gt;) plots each columns of
-            <literal>y</literal> versus vector <literal>x</literal>. In this case the
-            number of columns of <literal>y</literal> should be equal to the number of
+            <literal>y</literal> versus vector <literal>x</literal>. The
+            number of rows of <literal>y</literal> must be equal to the number of
             <literal>x</literal> entries.
         </para>
         <para>
             If <literal>x</literal> and <literal>y</literal> are matrices,
             plot2d(x,y,&lt;opt_args&gt;) plots each columns of <literal>y</literal>
-            versus corresponding column of <literal>x</literal>. In this case the
-            <literal>x</literal> and <literal>y</literal> sizes should be the
-            same.
+            versus corresponding column of <literal>x</literal>.
+            <literal>x</literal> and <literal>y</literal> must then have the same sizes.
         </para>
         <para>
             If <literal>y</literal> is a vector, plot2d(y,&lt;opt_args&gt;)
diff --git a/scilab/modules/graphics/help/fr_FR/figure_operations/CHAPTER b/scilab/modules/graphics/help/fr_FR/figure_operations/CHAPTER
new file mode 100644 (file)
index 0000000..fe10c02
--- /dev/null
@@ -0,0 +1 @@
+title = Fenêtres - Figures
diff --git a/scilab/modules/graphics/help/fr_FR/geometric_shapes/CHAPTER b/scilab/modules/graphics/help/fr_FR/geometric_shapes/CHAPTER
new file mode 100644 (file)
index 0000000..f75efcd
--- /dev/null
@@ -0,0 +1 @@
+title = Arcs - Rectangles
\ No newline at end of file
diff --git a/scilab/modules/graphics/help/fr_FR/interaction/CHAPTER b/scilab/modules/graphics/help/fr_FR/interaction/CHAPTER
new file mode 100644 (file)
index 0000000..ea357e4
--- /dev/null
@@ -0,0 +1 @@
+title = Interactivité
\ No newline at end of file
diff --git a/scilab/modules/graphics/help/fr_FR/lighting/CHAPTER b/scilab/modules/graphics/help/fr_FR/lighting/CHAPTER
new file mode 100644 (file)
index 0000000..533fc9f
--- /dev/null
@@ -0,0 +1 @@
+title = Éclairage
\ No newline at end of file
diff --git a/scilab/modules/graphics/help/fr_FR/polygon/CHAPTER b/scilab/modules/graphics/help/fr_FR/polygon/CHAPTER
new file mode 100644 (file)
index 0000000..710deae
--- /dev/null
@@ -0,0 +1 @@
+title = Polygones
index 24c9728..71c32a1 100644 (file)
@@ -2,6 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
+ * Copyright (C) 2009 - DIGITEO - Pierre Lando
+ * Copyright (C) 2010 - DIGITEO - Yann Collette
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="plot2d" xml:lang="pt">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:id="plot2d" xml:lang="en">
     <refnamediv>
         <refname>plot2d</refname>
-        <refpurpose>esboço 2d</refpurpose>
+        <refpurpose>2D plot</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>plot2d([x],y)
-            plot2d([x],y,&lt;opt_args&gt;)
+        <title>Syntax</title>
+        <synopsis>
+            plot2d([logflag,][x,],y[,style[,strf[,leg[,rect[,nax]]]]])
+            plot2d([logflag,][x,],y,&lt;opt_args&gt;)
         </synopsis>
     </refsynopsisdiv>
     <refsection role="parameters">
-        <title>Parâmetros</title>
+        <title>Arguments</title>
         <variablelist>
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>uma matriz ou vetor de reais. Se omitido, é assumido como
-                        sendo o vetor <literal>1:n</literal> onde <literal>n</literal> é o
-                        número de pontos da curva dados pelo parâmetro
-                        <literal>y</literal>.
+                    <para>a real matrix or vector. If omitted, it is assumed to be the
+                        vector <literal>1:n</literal> where <literal>n</literal> is the
+                        number of curve points given by the <literal>y</literal>
+                        parameter.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>uma matriz ou vetor de reais</para>
+                    <para>a real matrix or vector.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>&lt;opt_args&gt;</term>
                 <listitem>
-                    <para>representa uma seqüência de sentenças
-                        <literal>key1=value1,key2=value2</literal>,... onde
-                        <literal>key1</literal>, <literal>key2,...</literal> podem ser um
-                        dos seguintes:
+                    <para>This represents a sequence of statements
+                        <literal>key1=value1,key2=value2</literal>,... where
+                        <literal>key1</literal>, <literal>key2,...</literal> can be one of
+                        the following:
                     </para>
                     <variablelist>
                         <varlistentry>
-                            <term>style</term>
+                            <term>logflag</term>
                             <listitem>
-                                <para>ajusta o estilo da curva. O valor associado deve ser um
-                                    vetor de reais com valores inteiros (positivos ou
-                                    negativos)
+                                <para>sets the scale (linear or logarithmic) along the axes.
+                                    The associated value should be a string with possible
+                                    values: <literal>"nn"</literal>, <literal>"nl"</literal> ,
+                                    <literal>"ln"</literal> and <literal>"ll"</literal> .
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
-                            <term>rect</term>
+                            <term>style</term>
                             <listitem>
-                                <para>as fronteiras mínimas requeridas para o esboço. O valor
-                                    associado deve ser um vetor de reais com quatro entradas:
-                                    <literal>[xmin,ymin,xmax,ymax]</literal>.
+                                <para>sets the style for each curve. The associated value
+                                    should be a real vector with integer (positive or negative)
+                                    values.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
-                            <term>logflag</term>
+                            <term>strf</term>
                             <listitem>
-                                <para>ajusta a escala (linear ou logaritmica) ao longo dos
-                                    eixos. O valor associado deve ser um string com um dos
-                                    possíveis valores: <literal>"nn"</literal>,
-                                    <literal>"nl"</literal> , <literal>"ln"</literal> e
-                                    <literal>"ll"</literal> .
+                                <para>controls the display of captions.</para>
+                                <para>
+                                    <literal>strf</literal> is a string of length 3
+                                    <literal>"xyz"</literal> (by default <literal>strf=
+                                        "081"
+                                    </literal>
+                                    )
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
-                            <term>frameflag</term>
+                            <term>leg</term>
                             <listitem>
-                                <para>controla a computação dos intervalos de coordenadas
-                                    reais a partir dos valores mínimos requeridos. O valor
-                                    associado deve ser um inteiro entre 0 e 8
+                                <para>sets the curves captions. The associated value should be
+                                    a character string.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
-                            <term>axesflag</term>
+                            <term>rect</term>
                             <listitem>
-                                <para>especifica como os eixos são desenhados. O valor
-                                    associado deve ser um inteiro entre 0 e 5
+                                <para>sets the minimal bounds requested for the plot. The
+                                    associated value should be a real vector with four entries:
+                                    <literal>[xmin,ymin,xmax,ymax]</literal>.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>nax</term>
                             <listitem>
-                                <para>ajusta os rótulos dos eixos e a definição de tiques. O
-                                    valor associado deve ser um vetor de quatro entradas inteiras
-                                    <literal>[nx,Nx,ny,Ny]</literal>
+                                <para>sets the axes labels and tics definition. The associated
+                                    value should be a real vector with four integer entries
+                                    <literal>[nx,Nx,ny,Ny].</literal>
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
-                            <term>leg</term>
+                            <term>frameflag</term>
                             <listitem>
-                                <para>ajusta a legenda das curvas. O valor associado deve ser
-                                    um string
+                                <para>controls the computation of the actual coordinate ranges
+                                    from the minimal requested values. The associated value should
+                                    be an integer ranging from 0 to 8.
+                                </para>
+                            </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                            <term>axesflag</term>
+                            <listitem>
+                                <para>specifies how the axes are drawn. The associated value
+                                    should be an integer ranging from 0 to 5 or 9 (default value).
                                 </para>
                             </listitem>
                         </varlistentry>
         </variablelist>
     </refsection>
     <refsection role="description">
-        <title>Descrição</title>
+        <title>Description</title>
         <para>
-            <literal>plot2d</literal> esboça um conjunto de curvas 2d. Se você
-            está familiarizado com a sintaxe do Matlab da função
-            <literal>plot</literal> , você deve usar <link linkend="plot">plot</link>.
+            <literal>plot2d</literal> plots a set of 2D curves. If you are
+            familiar with Matlab <literal>plot</literal> syntax, you should use <link linkend="plot">plot</link>.
         </para>
         <para>
-            Se <literal>x</literal> e <literal>y</literal> são vetores,
-            plot2d(x,y,&lt;opt_args&gt;) esboça o vetor <literal>y</literal> versus o
-            vetor <literal>x</literal>. Os vetores <literal>x</literal> e
-            <literal>y</literal> vectors devem ter o mesmo número de entradas.
+            If <literal>x</literal> and <literal>y</literal> are vectors,
+            plot2d(x,y,&lt;opt_args&gt;) plots vector <literal>y</literal> versus
+            vector <literal>x</literal>. <literal>x</literal> and <literal>y</literal>
+            vectors should have the same number of entries.
         </para>
         <para>
-            Se <literal>x</literal> é um vetor e <literal>y</literal> uma matriz
-            plot2d(x,y,&lt;opt_args&gt;) esboça cada coluna de <literal>y</literal>
-            versus o vetor <literal>x</literal>. Neste caso, o número de colunas de
-            <literal>y</literal> deve ser igual ao número de entradas de
-            <literal>x</literal>.
+            If <literal>x</literal> is a vector and <literal>y</literal> a
+            matrix plot2d(x,y,&lt;opt_args&gt;) plots each columns of
+            <literal>y</literal> versus vector <literal>x</literal>. The
+            number of rows of <literal>y</literal> must be equal to the number of
+            <literal>x</literal> entries.
         </para>
         <para>
-            Se <literal>x</literal> e <literal>y</literal> são matrizes,
-            plot2d(x,y,&lt;opt_args&gt;) esboça cada coluna de <literal>y</literal>
-            versus a coluna correspondente de <literal>x</literal>. Neste caso,
-            <literal>x</literal> e <literal>y</literal> devem ter o mesmo
-            tamanho.
+            If <literal>x</literal> and <literal>y</literal> are matrices,
+            plot2d(x,y,&lt;opt_args&gt;) plots each columns of <literal>y</literal>
+            versus corresponding column of <literal>x</literal>.
+            <literal>x</literal> and <literal>y</literal> must then have the same sizes.
         </para>
         <para>
-            Se <literal>y</literal> é um vetor, plot2d(y,&lt;opt_args&gt;)
-            esboça o vetor <literal>y</literal> versus o vetor
+            If <literal>y</literal> is a vector, plot2d(y,&lt;opt_args&gt;)
+            plots vector <literal>y</literal> versus vector
             <literal>1:size(y,'*')</literal>.
         </para>
         <para>
-            Se <literal>y</literal> é uma matriz, plot2d(y,&lt;opt_args&gt;)
-            esboça cada coluna de <literal>y</literal> versus o vetor
+            If <literal>y</literal> is a matrix, plot2d(y,&lt;opt_args&gt;)
+            plots each columns of <literal>y</literal> versus vector
             <literal>1:size(y,1)</literal>.
         </para>
         <para>
-            Os argumentos <literal>&lt;opt_args&gt;</literal> devem ser usados
-            para customizar o esboço.
+            The <literal>&lt;opt_args&gt;</literal> arguments should be used to
+            customize the plot
         </para>
         <variablelist>
             <varlistentry>
+                <term>logflag</term>
+                <listitem>
+                    <para>This option may be used to set the scale (linear or
+                        logarithmic) along the axes. The associated value should be a
+                        string with possible values: <literal>"nn"</literal>,
+                        <literal>"nl"</literal> , <literal>"ln"</literal> and
+                        <literal>"ll"</literal>. <literal>"l"</literal> stands for
+                        logarithmic scale and graduations and <literal>"n"</literal> for
+                        normal scale.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>style</term>
                 <listitem>
-                    <para>esta opção deve ser usada para especificar como as curvas são
-                        desenhadas. Se esta opção for especificada, o valor associado deve
-                        ser um vetor com tantas entradas quanto as curvas.
+                    <para>This option may be used to specify how the curves are drawn.
+                        If this option is specified, the associated value should be a vector
+                        with as many entries as curves.
                     </para>
                     <itemizedlist>
                         <listitem>
                             <para>
-                                Se <literal>style(i)</literal> é estritamente crescente, a
-                                curva é desenhada como uma linha simples e
-                                <literal>style(i)</literal> define o índice da cor para
-                                utilizada para desenhar a curva (ver <link linkend="getcolor">getcolor</link>). Note que o estilo de linha
-                                e a espessura podem ser ajustados através das propriedades da
-                                entidade poligonal (ver <link linkend="polyline_properties">polyline_properties</link>).
+                                if <literal>style(i)</literal> is strictly positive, the
+                                curve is drawn as plain line and <literal>style(i)</literal>
+                                defines the index of the color used to draw the curve (see <link linkend="getcolor">getcolor</link>). Note that the line style
+                                and the thickness can be set through the polyline entity
+                                properties (see <link linkend="polyline_properties">polyline_properties</link>).
                             </para>
-                            <para>Interpolação linear é feita entre os dados pontos da
-                                curva.
+                            <para>Piecewise linear interpolation is done between the given
+                                curve points.
                             </para>
                         </listitem>
                         <listitem>
                             <para>
-                                Se <literal>style(i)</literal> é negativo ou zero, os
-                                pontos dados são desenhados utilizando-se marcas,
-                                <literal>abs(style(i))</literal> define a marca com
-                                identificador utilizada. Note que as cores das marcas e seus
-                                tamanhos podem ser ajustados através das propriedades da
-                                entidade poligonal (ver <link linkend="polyline_properties">polyline_properties</link>).
+                                if <literal>style(i)</literal> is negative or zero, the
+                                given curve points are drawn using marks,
+                                <literal>abs(style(i))</literal> defines the mark with id used.
+                                Note that the marks color and marks sizes can be set through
+                                the polyline entity properties (see <link linkend="polyline_properties">polyline_properties</link>).
                             </para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>logflag</term>
+                <term>strf</term>
+                <listitem>
+                    <para>
+                        is a string of length 3 <literal>"xyz"</literal> (by default
+                        <literal>strf= "081"</literal>)
+                    </para>
+                    <variablelist>
+                        <varlistentry>
+                            <term>x</term>
+                            <listitem>
+                                <para>controls the display of captions.</para>
+                                <variablelist>
+                                    <varlistentry>
+                                        <term>x=0</term>
+                                        <listitem>
+                                            <para>no caption.</para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>x=1</term>
+                                        <listitem>
+                                            <para>captions are displayed. They are given by the
+                                                optional argument <literal>leg</literal>.
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                </variablelist>
+                            </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                            <term>y</term>
+                            <listitem>
+                                <para>controls the computation of the actual coordinate ranges
+                                    from the minimal requested values. Actual ranges can be larger
+                                    than minimal requirements.
+                                </para>
+                                <variablelist>
+                                    <varlistentry>
+                                        <term>y=0</term>
+                                        <listitem>
+                                            <para>no computation, the plot use the previous (or
+                                                default) scale
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=1</term>
+                                        <listitem>
+                                            <para>from the rect arg</para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=2</term>
+                                        <listitem>
+                                            <para>from the min/max of the x, y data</para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=3</term>
+                                        <listitem>
+                                            <para>built for an isometric scale from the rect
+                                                arg
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=4</term>
+                                        <listitem>
+                                            <para>built for an isometric plot from the min/max of
+                                                the x, y data
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=5</term>
+                                        <listitem>
+                                            <para>enlarged for pretty axes from the rect arg</para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=6</term>
+                                        <listitem>
+                                            <para>enlarged for pretty axes from the min/max of the
+                                                x, y data
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=7</term>
+                                        <listitem>
+                                            <para>like y=1 but the previous plot(s) are redrawn to
+                                                use the new scale
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>y=8</term>
+                                        <listitem>
+                                            <para>like y=2 but the previous plot(s) are redrawn to
+                                                use the new scale
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                </variablelist>
+                            </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                            <term>z</term>
+                            <listitem>
+                                <para>controls the display of information on the frame around
+                                    the plot. If axes are requested, the number of tics can be
+                                    specified by the <literal>nax</literal> optional
+                                    argument.
+                                </para>
+                                <variablelist>
+                                    <varlistentry>
+                                        <term>z=0</term>
+                                        <listitem>
+                                            <para>nothing is drawn around the plot.</para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>z=1</term>
+                                        <listitem>
+                                            <para>axes are drawn, the y=axis is displayed on the
+                                                left.
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>z=2</term>
+                                        <listitem>
+                                            <para>the plot is surrounded by a box without
+                                                tics.
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>z=3</term>
+                                        <listitem>
+                                            <para>axes are drawn, the y=axis is displayed on the
+                                                right.
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>z=4</term>
+                                        <listitem>
+                                            <para>axes are drawn centred in the middle of the frame
+                                                box.
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                    <varlistentry>
+                                        <term>z=5</term>
+                                        <listitem>
+                                            <para>axes are drawn so as to cross at point
+                                                <literal>(0,0)</literal>. If point
+                                                <literal>(0,0)</literal> does not lie inside the frame,
+                                                axes will not appear on the graph.
+                                            </para>
+                                        </listitem>
+                                    </varlistentry>
+                                </variablelist>
+                            </listitem>
+                        </varlistentry>
+                    </variablelist>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>leg</term>
                 <listitem>
-                    <para>esta opção é usada para ajustar a escala (linear ou
-                        logarítmica) ao longo dos eixos O valor associado é um string com um
-                        dos seguintes valores: <literal>"nn"</literal>,
-                        <literal>"nl"</literal> , <literal>"ln"</literal> e
-                        <literal>"ll"</literal>. <literal>"l"</literal> significa escala e
-                        graduação logarítimica e <literal>"n"</literal> escala
-                        normal.
+                    <para>This option may be used to sets the curve captions. It must be
+                        a string with the form <literal>"leg1@leg2@...."</literal> where
+                        <literal>leg1</literal> , <literal>leg2</literal> , etc. are
+                        respectively the captions of the first curve, of the second curve,
+                        etc. The default is <literal> " "</literal>.
+                    </para>
+                    <para>The curve captions are drawn on below the x-axis. This option
+                        is not flexible enough, use the <link linkend="captions">captions</link> or <link linkend="legend">legend</link> functions preferably.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>rect</term>
                 <listitem>
-                    <para>esta opção pode ser usada para ajustar as fronteiras mínimas
-                        requeridas para o esboço. Se esta opção for especificada, o valor
-                        associado deve ser um vetor real de quatro entradas:
+                    <para>This option may be used to set the minimal bounds requested
+                        for the plot. If this option is specified, the associated value
+                        should be a real vector with four entries:
                     </para>
                     <para>
                         <literal>[xmin,ymin,xmax,ymax]</literal>.
-                        <literal>xmin</literal> e <literal>xmax</literal> definem os limites
-                        para as abscissas, enquanto <literal>ymin</literal> e
-                        <literal>ymax</literal> definem os limites para as ordenadas.
+                        <literal>xmin</literal> and <literal>xmax</literal> defines the
+                        bounds on the abscissae while <literal>ymin</literal> and
+                        <literal>ymax</literal> defines the bounds on the ordinates.
+                    </para>
+                    <para>This argument may be used together with the
+                        <literal>frameflag</literal> option to specify how the axes
+                        boundaries are derived from the given <literal>rect</literal>
+                        argument. If the <literal>frameflag</literal> option is not given,
+                        it is supposed to be <literal>frameflag=7</literal>.
+                    </para>
+                    <para>The axes boundaries can also be customized through the axes
+                        entity properties (see <link linkend="axes_properties">axes_properties</link>).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>nax</term>
+                <listitem>
+                    <para>This option may be used to specify the axes labels and tics
+                        definition. The associated value should be a real vector with four integer entries
+                        <literal>[nx,Nx,ny,Ny]</literal>.
                     </para>
-                    <para>Este argumento pode ser utilizado junto com a opção
-                        <literal>frameflag</literal> para especificar como os limites dos
-                        eixos derivam do argumento dado <literal>rect</literal>. Se a opção
-                        <literal>frameflag</literal> não for fornecida, é suposta como sendo
-                        <literal>frameflag=7</literal>.
+                    <para>
+                        <literal>Nx</literal> gives the number of main tics to be used
+                        on the x-axis (to use autoticks set it to -1), <literal>nx</literal> gives the number of
+                        subtics to be drawn between two main x-axis tics.
+                    </para>
+                    <para>
+                        <literal>Ny</literal> and <literal>ny</literal> give similar
+                        information for the y-axis.
                     </para>
-                    <para>As fronteiras dos eixos também podem ser customizadas através
-                        das propriedades da entidade de eixos (Axes) (ver <link linkend="axes_properties">axes_properties</link>).
+                    <para>
+                        If <literal>axesflag</literal> option is not set
+                        <literal>nax</literal> option supposes that
+                        <literal>axesflag</literal> option has been set to 9.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>frameflag</term>
                 <listitem>
-                    <para>esta opção pode ser usada para controlar a computação dos
-                        intervalos de coordenadas reais a partir de valores mínimos
-                        requeridos. Mudanças reais podem ser maiores que os requerimentos
-                        mínimos.
+                    <para>This option may be used to control the computation of the
+                        actual coordinate ranges from the minimal requested values. Actual
+                        ranges can be larger than minimal requirements.
                     </para>
                     <variablelist>
                         <varlistentry>
                             <term>frameflag=0</term>
                             <listitem>
-                                <para>não há computação, o esboço usa a escala anterior (ou
-                                    padrão).
+                                <para>no computation, the plot use the previous (or default)
+                                    scale.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>frameflag=1</term>
                             <listitem>
-                                <para>os intervalos reais são dados pela opção
-                                    <literal>rect</literal>.
+                                <para>The actual range is the range given by the
+                                    <literal>rect</literal> option.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>frameflag=2</term>
                             <listitem>
-                                <para>os intervalos reais são computados a partir dos valores
-                                    máximos e mínimos dos dados <literal>x</literal> e
-                                    <literal>y</literal>.
+                                <para>The actual range is computed from the min/max of the
+                                    <literal>x</literal> and <literal>y</literal> data.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>frameflag=3</term>
                             <listitem>
-                                <para>os intevalo reais são os intervalos fornecidos pela
-                                    opção <literal>rect</literal> e aumentados para se obter uma
-                                    escala isométrica.
+                                <para>The actual range is the range given by the
+                                    <literal>rect</literal> option and enlarged to get an
+                                    isometric scale.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>frameflag=4</term>
                             <listitem>
-                                <para>os intervalos reais são computados a partir dos valores
-                                    máximos e mínimos de <literal>x</literal> e
-                                    <literal>y</literal> e aumentados para se obter uma escala
-                                    isométrica.
+                                <para>The actual range is computed from the min/max of the
+                                    <literal>x</literal> and <literal>y</literal> data and
+                                    enlarged to get an isometric scale.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>frameflag=5</term>
                             <listitem>
-                                <para>os intervalos reais são os intervalos fornecidos pela
-                                    opção <literal>rect</literal> e aumentados para se obter
-                                    rótulos de eixos embelezados.
+                                <para>The actual range is the range given by the
+                                    <literal>rect</literal> option and enlarged to get pretty axes
+                                    labels.
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>frameflag=6</term>
                             <listitem>
-                                <para>os intervalos reais são computados a partir dos valores
-                                    mínimos dos dados <literal>x</literal> e <literal>y</literal>
-                                    e então aumentados para se obter rótulos de eixos
-                                    embelezados.
+                                <para>The actual range is computed from the min/max of the
+                                    <literal>x</literal> and <literal>y</literal> data and
+                                    enlarged to get pretty axes labels.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>frameflag=7</term>
                             <listitem>
                                 <para>
-                                    é como <literal>frameflag=1</literal> , mas os esboços
-                                    anteriores são redesenhados em uma nova escala. É utilizado
-                                    para adicionar o gráfico corrente a um anterior.
+                                    like <literal>frameflag=1</literal> but the previous
+                                    plot(s) are redrawn to use the new scale. Used to add the
+                                    current graph to a previous one.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>frameflag=8</term>
                             <listitem>
                                 <para>
-                                    é como <literal>frameflag=2</literal> , mas os esboços
-                                    anteriores são redesenhados em uma nova escala. É utilizado
-                                    para adicionar o gráfico corrente a um anterior.
+                                    like<literal>frameflag=2</literal> but the previous
+                                    plot(s) are redrawn to use the new scale. Used to add the
+                                    current graph to a previous one.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>frameflag=9</term>
                             <listitem>
                                 <para>
-                                    é como <literal>frameflag=8</literal> mas a imagem é
-                                    aumentada enlarged to para se obter rótulos de eixos
-                                    embelezados. Este é o alor padrão
+                                    like<literal>frameflag=8</literal> but the range is
+                                    enlarged to get pretty axes labels. This is the default
+                                    value.
                                 </para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
-                    <para>Os limites dos eixos também podem ser customizados através das
-                        propriedades da entidade de eixos (ver <link linkend="axes_properties">axes_properties</link>)
+                    <para>The axes boundaries can also be customized through the axes
+                        entity properties (see <link linkend="axes_properties">axes_properties</link>)
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>axesflag</term>
                 <listitem>
-                    <para>esta opção pode ser utilizada para especificar como os eixos
-                        são desenhados. O valor associado deve ser um inteiro entre 0 e 5
-                        :
+                    <para>This option may be used to specify how the axes are drawn. The
+                        associated value should be an integer ranging from 0 to 5 :
                     </para>
                     <variablelist>
                         <varlistentry>
                             <term>axesflag=0</term>
                             <listitem>
-                                <para>nada é desenhado ao redor do esboço (axes_visible=["off"
+                                <para>nothing is drawn around the plot (axes_visible=["off"
                                     "off"];box="off").
                                 </para>
                             </listitem>
                         <varlistentry>
                             <term>axesflag=1</term>
                             <listitem>
-                                <para>os eixos são desenhados, o eixo y é exibido à esquerda
+                                <para>axes are drawn, the y-axis is displayed on the left
                                     (axes_visible=["on" "on"];box="on",y_location="left").
                                 </para>
                             </listitem>
                         <varlistentry>
                             <term>axesflag=2</term>
                             <listitem>
-                                <para>o esboço é cercado por uma caixa sem tiques.
+                                <para>the plot is surrounded by a box without tics
                                     (axes_visible=["off" "off"];box="on").
                                 </para>
                             </listitem>
                         <varlistentry>
                             <term>axesflag=3</term>
                             <listitem>
-                                <para>os eixos são desenhados, o eixo y é exibido à direita
-                                    (axes_visible=["on"
+                                <para>axes are drawn, the y-axis is displayed on the
+                                    right (axes_visible=["on"
                                     "on"];box="off",y_location="right").
                                 </para>
                             </listitem>
                         <varlistentry>
                             <term>axesflag=4</term>
                             <listitem>
-                                <para>os eixos são desenhados centrados no meio da caixa de
-                                    moldura
+                                <para>axes are drawn centered in the middle of the frame, the box
+                                    being not drawn (axes_visible=["on" "on"];box="off",x_location="middle",
+                                    y_location="middle").
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>axesflag=5</term>
                             <listitem>
-                                <para>os eixos são desenhados para se cruzarem no ponto (0,0)
-                                    . Se o ponto (0,0) não estiver dentro da moldura, os eixos não
-                                    aparecerão no gráfico (axes_visible=["on"
-                                    "on"];box="on",y_location="middle").
+                                <para>axes are drawn centered in the middle of the frame similarly to
+                                    <literal>axesflag=4</literal>, the difference being that the box is drawn
+                                    (axes_visible=["on" "on"];box="on",x_location="middle",y_location="middle").
                                 </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>axesflag=9</term>
                             <listitem>
-                                <para>os eixos são desenhados, o eixo y é exibido à esquerda
-                                    (axes_visible=["on" "on"];box="off",y_location="left"). Este é
-                                    o valor padrão
+                                <para>axes are drawn, the y-axis is displayed on the left
+                                    (axes_visible=["on" "on"];box="off",y_location="left"). This
+                                    is the default value.
                                 </para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
-                    <para>O aspecto dos eixos também pode ser customizado através das
-                        propriedades da entidade de eixos (ver <link linkend="axes_properties">axes_properties</link>).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>nax</term>
-                <listitem>
-                    <para>esta opção pode ser utilizada para se especificar os rótulos
-                        dos eixos e a definição de tiques quando a opção
-                        <literal>axesflag=1</literal> é utilizada. O valor associado deve
-                        ser um vetor de inteiros com quatro entradas
-                        <literal>[nx,Nx,ny,Ny]</literal>.
-                    </para>
-                    <para>
-                        <literal>Nx</literal> fornece o número de tiques principais
-                        utilizados no eixo x (<emphasis role="bold">não mais levado em
-                            conta
-                        </emphasis>
-                        ), <literal>nx</literal> fornece o número de
-                        subtiques entre dois tiques principais no eixo x.
-                    </para>
-                    <para>
-                        <literal>Ny</literal> e <literal>ny</literal> fornecem as
-                        informações similares para o eixo y.
-                    </para>
-                    <para>
-                        Se a opção <literal>axesflag</literal> não for ajustada, a
-                        opção <literal>nax</literal> supõe que a opção
-                        <literal>axesflag</literal> foi ajustada para 1.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>leg</term>
-                <listitem>
-                    <para>esta opção pode ser usada para se ajustar as legendas das
-                        curvas. deve ser um string com a forma
-                        <literal>"leg1@leg2@...."</literal> onde <literal>leg1</literal> ,
-                        <literal>leg2</literal> , etc. São respectivamente as legendas para
-                        a primeira curva, segunda curva etc. o padrão é <literal> "
-                            "
-                        </literal>
-                        .
-                    </para>
-                    <para>As legendas de curvas são desenhadas abaixo do eixo x. Esta
-                        opção não é tão flexível, use as funções <link linkend="captions">captions</link> ou <link linkend="legend">legend</link> preferivelmente.
+                    <para>The axes aspect can also be customized through the axes
+                        entity properties (see <link linkend="axes_properties">axes_properties</link>).
                     </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection role="description">
-        <title>Mais Informações</title>
-        <para>Por padrão, esboços sucessivos são superpostos. para limpar o esboço
-            anterior use
+        <title>More information</title>
+        <para>By default, successive plots are superposed. To clear the previous plot, use
             <literal>
                 <link linkend="clf">clf()</link>
             </literal>
             .
         </para>
         <para>
-            Entre com o comando <literal>plot2d()</literal> para uma
-            demonstração.
+            Enter the command <literal>plot2d()</literal> to see a demo.
         </para>
-        <para>Outras funções plot2d de alto nível existem:</para>
+        <para>Other high level plot2d functions exist:</para>
         <itemizedlist>
             <listitem>
                 <para>
-                    plot2d2 é o mesmo que <literal>plot2d</literal> mas as curvas
-                    são supostas seccionalmente constantes.
+                    plot2d2 same as <literal>plot2d</literal> but the curve is
+                    supposed to be piecewise constant.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    plot2d3 é o mesmo que <literal>plot2d</literal> mas a curva é
-                    esboçada com barras verticais.
+                    plot2d3 same as <literal>plot2d</literal> but the curve is
+                    plotted with vertical bars.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    plot2d4 é o mesmo que <literal>plot2d</literal> mas a curva é
-                    esboçada com flechas.
+                    plot2d4 same as <literal>plot2d</literal> but the curve is
+                    plotted with vertical arrows.
                 </para>
             </listitem>
         </itemizedlist>
     </refsection>
     <refsection role="examples">
-        <title>Exemplos</title>
+        <title>Examples</title>
         <programlisting role="example"><![CDATA[
-// inicialização de x
+// x initialisation
 x=[0:0.1:2*%pi]';
-//esboço simples
+//simple plot
 plot2d(sin(x));
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(sin(x));
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,sin(x));
-//múltiplos esboços
+//multiple plot
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,sin(x));
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,[sin(x) sin(2*x) sin(3*x)])
-// múltiplos esboços sem fornecer as dimensões da moldura
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,[sin(x) sin(2*x) sin(3*x)])
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+// multiple plot giving the dimensions of the frame
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,[sin(x) sin(2*x) sin(3*x)],rect=[0,0,6,0.5]);
-//múltiplos esboços com legendas dados tiques + estilo
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,[sin(x) sin(2*x) sin(3*x)],rect=[0,0,6,0.5]);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+//multiple plot with captions and given tics + style
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,[sin(x) sin(2*x) sin(3*x)],..
        [1,2,3],leg="L1@L2@L3",nax=[2,10,2,10],rect=[0,-2,2*%pi,2]);
-// isovisualização
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,[sin(x) sin(2*x) sin(3*x)],..
+            [1,2,3],leg="L1@L2@L3",nax=[2,10,2,10],rect=[0,-2,2*%pi,2]);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+// isoview
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,sin(x),1,frameflag= 4);
-// escala
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,sin(x),1,frameflag= 4);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+// scale
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,sin(x),1,frameflag= 6);
-// auto-escala com esboços anteriores + estilo
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,sin(x),1,frameflag= 6);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+// auto scaling with previous plots + style
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,sin(x),-1);
 plot2d(x,2*sin(x),12);
 plot2d(2*x,cos(x),3);
-// eixo à direita
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,sin(x),-1);
+            plot2d(x,2*sin(x),12);
+            plot2d(2*x,cos(x),3);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+// axis on the right
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x,sin(x),leg="sin(x)");
-a=gca(); // manipulador da entidade Axes
+a=gca(); // Handle on axes entity
 a.y_location ="right";
-// eixo centrado em (0,0)
+ ]]></programlisting>
+        <scilab:image>
+            x=[0:0.1:2*%pi]';
+            plot2d(x,sin(x),leg="sin(x)");
+            a=gca(); // Handle on axes entity
+            a.y_location ="right";
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+
+// axis centered at (0,0)
 clf();
+x=[0:0.1:2*%pi]';
 plot2d(x-4,sin(x),1,leg="sin(x)");
-a=gca(); // manipulador da entidade Axes
-a.x_location = "middle";
-a.y_location = "middle";
-// algumas operações sobre entidades criadas por plot2d ...
+a=gca(); // Handle on axes entity
+a.x_location = "origin";
+a.y_location = "origin";
+// Some operations on entities created by plot2d ...
 isoview()
 a=gca();
-a.children // lista dos galhos dos eixos
-// há um Compound formado por duas poligonais e uma legenda
-poly1= a.children(1).children(1); //armazena um manipulador de poligonal em poly1
-poly1.foreground = 4; // outra maneira de se mudar o estilo...
-poly1.thickness = 3;  // ...e a espessura de uma curva.
-poly1.clip_state='off'; // controle de recorte
-leg = a.children(2); // armazena manipulador de legenda em leg
+a.children // list the children of the axes.
+// There are a compound made of two polylines and a legend
+poly1= a.children(1).children(1); //store polyline handle into poly1
+poly1.foreground = 4; // another way to change the style...
+poly1.thickness = 3;  // ...and the thickness of a curve.
+poly1.clip_state='off'; // clipping control
+leg = a.children(2); // store legend handle into leg
 leg.font_style = 9;
 leg.line_mode = "on";
 isoview("off")
  ]]></programlisting>
+        <scilab:image>
+            // axis centered at (0,0)
+            clf();
+            x=[0:0.1:2*%pi]';
+            plot2d(x-4,sin(x),1,leg="sin(x)");
+            a=gca(); // Handle on axes entity
+            a.x_location = "origin";
+            a.y_location = "origin";
+            // Some operations on entities created by plot2d ...
+            isoview()
+            a=gca();
+            a.children // list the children of the axes.
+            // There are a compound made of two polylines and a legend
+            poly1= a.children(1).children(1); //store polyline handle into poly1
+            poly1.foreground = 4; // another way to change the style...
+            poly1.thickness = 3;  // ...and the thickness of a curve.
+            poly1.clip_state='off'; // clipping control
+            leg = a.children(2); // store legend handle into leg
+            leg.font_style = 9;
+            leg.line_mode = "on";
+            isoview("off")
+        </scilab:image>
     </refsection>
-    <refsection>
-        <title>Ver Também</title>
+    <refsection role="see also">
+        <title>See also</title>
         <simplelist type="inline">
             <member>
                 <link linkend="plot">plot</link>
@@ -579,8 +836,4 @@ isoview("off")
             </member>
         </simplelist>
     </refsection>
-    <refsection>
-        <title/>
-        <para/>
-    </refsection>
 </refentry>
index 6ac38bf..f26f600 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Online help management",SCI+"/modules/helptools/help/en_US",%T);
+add_help_chapter("Documentation system",SCI+"/modules/helptools/help/en_US",%T);
 
index 8efa1b5..c0316ec 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Gestion de l''aide en ligne",SCI+"/modules/helptools/help/fr_FR",%T);
+add_help_chapter("Documentation : gestion",SCI+"/modules/helptools/help/fr_FR",%T);
 
index 83b3cfd..bc5479b 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Gestion de l''historique",SCI+"/modules/history_manager/help/fr_FR",%T);
+add_help_chapter("Historique des commandes",SCI+"/modules/history_manager/help/fr_FR",%T);
 
index d887631..ac5deeb 100644 (file)
@@ -16,7 +16,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="setdefaultlanguage" xml:lang="en">
     <refnamediv>
         <refname>setdefaultlanguage</refname>
-        <refpurpose>Permanently changes the language of Scilab's user interface.</refpurpose>
+        <refpurpose>sets the language of the session at startup and for some fixed Scilab menus</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
index e40681d..30b3d63 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Editeur de texte (Scinotes)",SCI+"/modules/scinotes/help/fr_FR",%T);
+add_help_chapter("Editeur de script Scinotes",SCI+"/modules/scinotes/help/fr_FR",%T);
 
index e8ba764..8851c22 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Simulated Annealing",SCI+"/modules/simulated_annealing/help/en_US",%T);
+add_help_chapter("Optimization: Annealing",SCI+"/modules/simulated_annealing/help/en_US",%T);
 
index 852c2ba..6bd5cc2 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Simulated Annealing",SCI+"/modules/simulated_annealing/help/fr_FR",%T);
+add_help_chapter("Optimisation : recuit simulé",SCI+"/modules/simulated_annealing/help/fr_FR",%T);
 
index 9a24234..5a72b39 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Manipulation de fichiers sons",SCI+"/modules/sound/help/fr_FR",%T);
+add_help_chapter("Sons - fichiers audio",SCI+"/modules/sound/help/fr_FR",%T);
 
index 1a06df4..4cb3c01 100644 (file)
@@ -10,5 +10,5 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Interface avec Tcl/Tk",SCI+"/modules/tclsci/help/fr_FR",%T);
+add_help_chapter("Tcl/Tk",SCI+"/modules/tclsci/help/fr_FR",%T);
 
index 1925ee6..f213ca5 100644 (file)
@@ -10,4 +10,4 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-add_help_chapter("Gestion des fichiers XML",SCI+"/modules/xml/help/fr_FR",%T);
+add_help_chapter("Traitement XML",SCI+"/modules/xml/help/fr_FR",%T);