[doc] misc. improvements 13/21513/17
Samuel GOUGEON [Sat, 27 Jun 2020 20:41:38 +0000 (22:41 +0200)]
 * brackets: update after 4d08a758
 * text_properties: Wrong .fill_mode description: http://bugzilla.scilab.org/16499
 * polyline_properties: mark_size mark_foreground mark_background
   can now be vectors. line_style image moved example => parameters
 * repmat:
    + The input A can be an hypermat or ND-array.
    + Examples enriched and illustrated.
    + See also: + kron, ndgrid, insertion, - extraction, matrix, size
 * squeeze: for any input type (not only reals). Examples enriched illustrated.
 * sum: encoded integers were not documented as acceptable input.

Change-Id: Ia111e6e21862948e76b1bee10686b66c99511a63

29 files changed:
scilab/modules/core/help/en_US/1_keywords/brackets.xml
scilab/modules/core/help/fr_FR/1_keywords/brackets.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/repmat.xml
scilab/modules/elementary_functions/help/en_US/matrixmanipulation/squeeze.xml
scilab/modules/elementary_functions/help/en_US/matrixoperations/sum.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/random/grand.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/repmat.xml
scilab/modules/elementary_functions/help/fr_FR/matrixmanipulation/squeeze.xml
scilab/modules/elementary_functions/help/fr_FR/matrixoperations/sum.xml
scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/repmat.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/matrixmanipulation/squeeze.xml [deleted file]
scilab/modules/elementary_functions/help/ja_JP/matrixoperations/sum.xml
scilab/modules/elementary_functions/help/pt_BR/matrixmanipulation/squeeze.xml [deleted file]
scilab/modules/elementary_functions/help/pt_BR/matrixoperations/sum.xml
scilab/modules/elementary_functions/help/ru_RU/complex/complex.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/repmat.xml
scilab/modules/elementary_functions/help/ru_RU/matrixmanipulation/squeeze.xml
scilab/modules/elementary_functions/help/ru_RU/matrixoperations/sum.xml
scilab/modules/elementary_functions/macros/repmat.sci
scilab/modules/external_objects_java/help/en_US/jinvoke.xml
scilab/modules/external_objects_java/help/ja_JP/jinvoke.xml
scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
scilab/modules/graphics/help/en_US/text/text_properties.xml
scilab/modules/graphics/help/ja_JP/polygon/polyline_properties.xml
scilab/modules/graphics/help/ja_JP/text/text_properties.xml
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/polyline_properties_1.png
scilab/modules/helptools/images/polyline_properties_2.png
scilab/modules/helptools/images/polyline_properties_3.png

index 4a0abfa..1791858 100644 (file)
                                     as soon as a sparse-encoded component is met and processed.
                                 </listitem>
                                 <listitem>
-                                    It is possible to concatenate polynomials or/and rationals
-                                    having different variable names. Then, the first polynomial
-                                    or rational met in the list sets the variable name to the
-                                    concatenation result:
-                                    <literal>[%z, 1+%s, 1-%i*%s]
-                                        // => [z, 1+z, 1-iz]
-                                    </literal>.
+                                    Concatenated polynomials or/and rationals must have the same
+                                    variable name.
                                 </listitem>
                                 <listitem>
                                     Text components can be concatenated (in the set meaning,
@@ -346,8 +341,7 @@ v = [10 1/%z], typeof(v)
         </para>
         <programlisting role="example"><![CDATA[
 [%F %z]
-[int8(%pi), uint8(%e)]
-[int8(%pi), int16(%e)]
+[%s %z]
 [int8(-70), sparse(18)]
 [int8(-70), sparse([%T %F])]
      ]]></programlisting>
@@ -355,6 +349,7 @@ v = [10 1/%z], typeof(v)
             Concatenation of cells arrays:
         </para>
         <programlisting role="example"><![CDATA[
+// Concatenation of cells arrays:
 c1 = {%pi %t};
 c2 = {%z "abc"};
 c = [[{%i} c1] ; [c2, {1/%z^2}]]  // comma mandatory, to not parse c2{1/%z^2}
@@ -464,8 +459,14 @@ s.r([2 4 6])
             <revision>
                 <revnumber>6.1.1</revnumber>
                 <revdescription>
-                    Concatenations between encoded integers and decimal numbers
-                    are now supported.
+                    <itemizedlist>
+                        <listitem>
+                            Concatenations between encoded integers and decimal numbers are now supported.
+                        </listitem>
+                        <listitem>
+                            Concatenated polynomials or/and rationals must have the same variable name.
+                        </listitem>
+                    </itemizedlist>
                 </revdescription>
             </revision>
         </revhistory>
index 246ae0f..c88568b 100644 (file)
                                     </para>
                                 </listitem>
                                 <listitem>
-                                    Des polynômes ou des fractions rationnelles de différentes
-                                    variables peuvent être concaténés entre eux. Le premier polynôme
-                                    ou fraction rationnelle listé donne alors le nom de sa variable
-                                    au résultat de la concaténation :
-                                    <literal>[%z, 1+%s, 1-%i*%s]
-                                        // => [z, 1+z, 1-iz]
-                                    </literal>.
+                                    Des polynômes et/ou des fractions rationnelles à concaténer doivent
+                                    avoir la même variable symbolique.
                                 </listitem>
                                 <listitem>
                                     Les éléments de texte (type "string") peuvent être concaténés
@@ -369,8 +364,7 @@ v = [10 1/%z], typeof(v)
         </para>
         <programlisting role="example"><![CDATA[
 [%F %z]
-[int8(%pi) uint8(%e)]
-[int8(%pi) int16(%e)]
+[%s %z]
 [int8(-70), sparse(18)]
 [int8(-70), sparse([%T %F])]
      ]]></programlisting>
@@ -490,8 +484,16 @@ s.r([2 4 6])
             <revision>
                 <revnumber>6.1.1</revnumber>
                 <revdescription>
-                    Concaténer des entiers encodés avec des réels ou complexes
-                    est désormais possible.
+                    <itemizedlist>
+                        <listitem>
+                            Concaténer des entiers encodés avec des réels ou complexes
+                            est désormais possible.
+                        </listitem>
+                        <listitem>
+                            Des polynômes et/ou fractions rationnelles à concaténer doivent avoir la
+                            même variable symbolique.
+                        </listitem>
+                    </itemizedlist>
                 </revdescription>
             </revision>
         </revhistory>
index d9a67d6..d0eb8cf 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2011 - INRIA - Serge Steer
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2020 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * 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="repmat" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="repmat" xml:lang="en">
     <refnamediv>
         <refname>repmat</refname>
         <refpurpose>Replicate and tile an array</refpurpose>
             <varlistentry>
                 <term>A</term>
                 <listitem>
-                    <para>input 2D array.</para>
+                    Array of any native type (boolean, numeric, text,..., cells, structures),
+                    of any number of dimensions of any sizes. Boolean or numerical sparse
+                    matrices are supported.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>m, n, ...</term>
                 <listitem>
-                    <para>
-                        integers, number of <literal>A</literal> blocks for
-                        each dimension of <literal>B</literal>.
-                    </para>
+                    Positive integers: number of times that <varname>A</varname> must be replicated
+                    along the respective dimensions #1, #2, etc..
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>siz</term>
                 <listitem>
-                    <para>vector of integer, each element gives the number of
-                        <literal>A</literal> blocks for corresponding dimension of
-                        <literal>B</literal>.
-                    </para>
+                    Vector of replication numbers: <literal>siz=[m,n,..]</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>B</term>
                 <listitem>
-                    <para>
-                        resulting array form by tiling the <literal>A</literal> 2D array.
-                    </para>
+                    Tiled array or ND-array, of sizes [m*size(A,1), n*size(A,2), ..] or
+                    [siz(1)*size(A,1), siz(2)*size(A,2), ..].
+                    <para/>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection role="description">
         <title>Description</title>
         <para>
-            <literal>repmat(A,m,n)</literal> or similarly
-            <literal>repmat(A,[m,n])</literal> returns a large matrix
-            consisting of an <literal>m</literal>-by-<literal>n</literal>
-            tiling of copies of <literal>A</literal>. The size of the result
-            is <literal>[size(A,1)*M, size(A,2)*N]</literal>.
+            <emphasis role="bold">repmat(A, m)</emphasis> replicates and tiles
+            <literal>m</literal> × <literal>m</literal> copies of <varname>A</varname>.
+        </para>
+        <para>
+            <emphasis role="bold">repmat(A, m, n)</emphasis> or
+            <emphasis role="bold">repmat(A, [m, n])</emphasis> replicates and tiles
+            <literal>m</literal> × <literal>n</literal> copies of <varname>A</varname>.
         </para>
         <para>
-            <literal>repmat(A,m)</literal> creates an
-            <literal>m</literal>-by-<literal>m</literal> tiling.
+            <emphasis role="bold">repmat(A, m, n, p, ..)</emphasis> is a generalization of
+            <emphasis role="bold">repmat(A, m, n)</emphasis>.
         </para>
         <para>
-            <literal>repmat(A,[m n p ...])</literal> tiles the array A to produce a
-            multidimensional array  composed of copies of  <literal>A</literal>. The size of the result is
-            <literal>[size(A,1)*M, size(A,2)*N, size(A,3)*P, ...] </literal>.
+            <literal>repmat(…)</literal> extends <literal>ones(m,n,..) .*. A</literal>
+            to non-numerical inputs <varname>A</varname>.
         </para>
-        <para>For now,only arrays of real, integer, boolean, character
-            string, polynomial and rational as well as sparse matrices are
-            supported. This function definition can be extended using
-            overloading mechanism.
+        <para>
+             repmat(…)'s definition can be extended using the overloading mechanism.
         </para>
     </refsection>
     <refsection role="examples">
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-repmat(1:3,2,2)
-repmat(int8([1 0 1;0 1 0]),2,3,2)
-repmat("Scilab",3,2)
-t="Scilab";t(ones(3,2))
-repmat([1/%s;2/(%s+1)],1,3)
- ]]></programlisting>
+repmat([-1 3 7], 2, 4)
+
+repmat(int8([1 -2 3; 0 -1  1]), 2, 4, 2)
+
+b = cat(3, [%f %t %t], [%t %t %f])
+repmat(b, [2 3])
+
+t = "Scilab"; t(ones(2,4))
+repmat(["Scilab" "Xcos"], 2, 3)
+
+repmat([1/%s ; 2/(%s+1)], 1, 3)
+    ]]></programlisting>
+    <screen><![CDATA[
+--> repmat([-1 3 7], 2, 4)
+ ans  =
+  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.
+  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.
+
+
+--> repmat(int8([1 -2 3; 0 -1  1]), 2, 4, 2)
+ ans  =
+(:,:,1)
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+(:,:,2)
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+
+
+--> b = cat(3, [%f %t %t], [%t %t %f])
+ b  =
+(:,:,1)
+  F T T
+(:,:,2)
+  T T F
+
+--> repmat(b, [2 3])
+ ans  =
+(:,:,1)
+  F T T F T T F T T
+  F T T F T T F T T
+ (:,:,2)
+  T T F T T F T T F
+  T T F T T F T T F
+
+
+--> t = "Scilab"; t(ones(2,4))
+ ans  =
+  "Scilab"  "Scilab"  "Scilab"  "Scilab"
+  "Scilab"  "Scilab"  "Scilab"  "Scilab"
+
+--> repmat(["Scilab" "Xcos"], 2, 3)
+ ans  =
+  "Scilab"  "Xcos"  "Scilab"  "Xcos"  "Scilab"  "Xcos"
+  "Scilab"  "Xcos"  "Scilab"  "Xcos"  "Scilab"  "Xcos"
+
+
+--> repmat([1/%s ; 2/(%s+1)], 1, 3)
+ ans  =
+    1     1     1
+    -     -     -
+    s     s     s
+
+    2     2     2
+   ----  ----  ----
+   1 +s  1 +s  1 +s
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="matrix">matrix</link>
+                <link linkend="kron">kron</link>
             </member>
             <member>
-                <link linkend="extraction">extraction</link>
+                <link linkend="ndgrid">ndgrid</link>
             </member>
             <member>
-                <link linkend="size">size</link>
+                <link linkend="insertion">insertion</link>
             </member>
         </simplelist>
     </refsection>
index b2e98ae..8252cc9 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2020 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * 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="squeeze">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="squeeze">
     <refnamediv>
         <refname>squeeze</refname>
-        <refpurpose>removes singleton dimensions of a hypermatrix</refpurpose>
+        <refpurpose>removes singleton dimensions of a ND-array</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>hypOut = squeeze(hypIn)</synopsis>
+        <synopsis>r = squeeze(hypIn)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
             <varlistentry>
                 <term>hypIn</term>
                 <listitem>
-                    <para>a hypermatrix or matrix of constant type.</para>
+                    <para>a ND-array of any native type (boolean, .., cells, structures)</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>hypOut</term>
+                <term>r</term>
                 <listitem>
-                    <para>a hypermatrix or matrix of constant type.</para>
+                    <para>an array or ND-array of the same type.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Description</title>
         <para>
-            The <function>squeeze</function> function removes singleton dimensions of a
-            hypermatrix, that is any dimension for which the size is <literal>1</literal>. If
-            the input <varname>hypIn</varname> is a matrix, it is unaffected.
+            <literal>squeeze(…)</literal> removes singleton dimensions of an hypermatrix or ND-array,
+            that is any dimension for which the size is <literal>1</literal>.
+            If the input <varname>hypIn</varname> is a matrix, it is returned as is.
         </para>
+        <note>
+            Scilab squeezes highest singleton dimensions automatically.
+        </note>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-       M1 = zeros(2,1,5)
-       squeeze(M1)
-       squeeze(M1(:,:,1))
+// For 2D input matrices => no action
+u = squeeze(ones(1,4))
+size(u)
+
+// auto-squeezing of highest singleton dimensions:
+v = ones(2,3,1,1);
+size(v)
+
+// For an actual input ND-array:
+w = squeeze(ones(1,3,1,4))
+size(w)
+
+// for a 4D-array of cells
+c = cat(4, {%t}, {%pi}, {"abc"});
+size(c)
+x = squeeze(c)
+size(x)
+    ]]></programlisting>
+    <screen><![CDATA[
+--> u = squeeze(ones(1,4))
+ u  =
+   1.   1.   1.   1.
+
+--> size(u)
+ ans  =
+   1.   4.
+
+--> // auto-squeezing of highest singleton dimensions:
+--> v = ones(2,3,1,1);
+--> size(v)
+ ans  =
+   2.   3.
+
+--> // For an actual input ND-array:
+--> w = squeeze(ones(1,3,1,4))
+ w  =
+   1.   1.   1.   1.
+   1.   1.   1.   1.
+   1.   1.   1.   1.
+
+--> size(w)
+ ans  =
+   3.   4.
+
+
+--> // for a 4D-array of cells
+--> c = cat(4, {%t}, {%pi}, {"abc"});
+--> size(c)
+ ans  =
+   1.   1.   1.   3.
+
+--> x = squeeze(c)
+ x  =
+  [1x1 boolean ]
+  [1x1 constant]
+  [1x1 string  ]
 
-       M2 = matrix(1:4, [2 1 2 1])
-       squeeze(M2)
-       ]]></programlisting>
+--> size(x)
+ ans  =
+   3.   1.
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index 6e933d3..0938e8c 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="sum" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="sum" xml:lang="en">
     <refnamediv>
         <refname>sum</refname>
         <refpurpose>sum of array elements</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>y=sum(x)
-            y=sum(x,orientation)
-            y=sum(x,outtype)
-            y=sum(x,orientation,outtype)
+        <synopsis>
+            y = sum(x)
+            y = sum(x, outtype)
+            y = sum(x, orientation)
+            y = sum(x, orientation, outtype)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>
-                        an array of  reals, complex, booleans,  polynomials or
-                        rational fractions.
-                    </para>
+                    Array of booleans (full or sparse), encoded integers,
+                    real or complex numbers (full or sparse), polynomials, or rationals.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>orientation</term>
                 <listitem>
-                    <para>
-                        it can be either
-                    </para>
+                    it can be either
                     <itemizedlist>
                         <listitem>
-                            <para>
-                                a string with possible values <literal>"*"</literal>, <literal>"r"</literal>,
-                                <literal>"c"</literal> or  <literal>"m"</literal>
-                            </para>
+                            a character <literal>"*"</literal> (default), <literal>"r"</literal>,
+                          <literal>"c"</literal> or  <literal>"m"</literal>
                         </listitem>
                         <listitem>
-                            <para>a number with positive integer value</para>
+                            a positive integer: Index of the dimension along which the sums must be computed.
                         </listitem>
                     </itemizedlist>
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>outtype</term>
                 <listitem>
-                    <para>
-                        a string with possible values <literal>"native"</literal> or <literal>"double"</literal>.
-                    </para>
+                    string <literal>"native"</literal> or <literal>"double"</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>scalar or array</para>
+                    scalar or array
+                    <para/>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-A=[1,2;3,4];
+A = [1,2 ; 3,4];
 sum(A)
 sum(A,1)
 
-I=uint8([2 95 103;254 9 0])
-sum(I) //native evaluation
-sum(I,"double")
-sum(I,2,"double")
+I = uint8([2 95 103;254 9 0])
+sum(I) // native evaluation
+sum(I, "double")
+sum(I, 2, "double")
 
-s=poly(0,"s");
-P=[s,%i+s;s^2,1];
+s = poly(0,"s");
+P = [s,%i+s;s^2,1];
 sum(P),
-sum(P,2)
+sum(P, 2)
 
-B=[%t %t %f %f];
+B = [%t %t %f %f];
 sum(B) //evaluation in float
-sum(B,"native") //similar to or(B)
+sum(B, "native") //similar to or(B)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="plus">plus</link>
+            </member>
+            <member>
                 <link linkend="cumsum">cumsum</link>
             </member>
             <member>
index ec43c97..fd91658 100644 (file)
         <para>
             Les séquences d'appel :
         </para>
-        <screen>
+        <programlisting role="no-scilab-exec"><![CDATA[
             Y = grand(m, n, "bet", A, B)
             Y = grand(m, n, "bin", N, p)
             Y = grand(m, n, "nbn", N, p)
             Y = grand(m, n, "unf", Low, High)
             Y = grand(m, n, "uin", Low, High)
             Y = grand(m, n, "lgi")
-        </screen>
+     ]]></programlisting>
         <para>
             produisent une matrice de taille <literal>m</literal>-par-<literal>n</literal> de nombres aléatoires.
 
         <para>
             Les séquences d'appel :
         </para>
-        <screen>
+        <programlisting role="no-scilab-exec"><![CDATA[
             Y = grand(n, "mn", Mean, Cov)
             Y = grand(n, "markov", P, x0)
             Y = grand(n, "mul", nb, P)
             Y = grand(n, "prm", vect)
-        </screen>
+     ]]></programlisting>
         <para>
             produisent une matrice de taille <literal>m</literal>-par-<literal>n</literal>
             avec des entrées aléatoires.
         <para>
             Les séquences d'appel :
         </para>
-        <screen>
+        <programlisting role="no-scilab-exec"><![CDATA[
             S = grand("getgen")
             grand("setgen", gen)
 
             grand("setall", s1, s2, s3, s4)
 
             grand("advnst", K)
-        </screen>
+     ]]></programlisting>
         <para>
             configurent ou interrogent les générateurs aléatoires.
         </para>
index 60b95ee..4936769 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2011 - INRIA - Serge Steer
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2020 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * 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="repmat" xml:lang="fr">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="repmat" xml:lang="fr">
     <refnamediv>
         <refname>repmat</refname>
         <refpurpose>Définit un grand tableau par pavage avec un tableau 2D.</refpurpose>
             <varlistentry>
                 <term>A</term>
                 <listitem>
-                    <para>tableau 2D.</para>
+                    Tableau de tout type natif quelconque (booléen, numérique, texte, ..., cellules,
+                    structures), de toute dimensionnalité, et de toutes tailles. Les matrices creuses
+                    booléennes ou numériques peuvent être répliquées.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>m, n, ...</term>
                 <listitem>
-                    <para>
-                        entiers, nombres de copie de <literal>A</literal> pour
-                        chaque dimension de <literal>B</literal>.
-                    </para>
+                    entiers positifs : nombres de fois que <varname>A</varname> doit être répliqué,
+                    selon chaque dimension respective de <varname>B</varname>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>siz</term>
                 <listitem>
-                    <para>vecteur d'entiers, Chaque élément donne le nombre de
-                        copie de <literal>A</literal> pour la dimension
-                        correspondante de <literal>B</literal>.
-                    </para>
+                    Vecteur des nombres de replications : <literal>siz=[m,n,..]</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>B</term>
                 <listitem>
-                    <para>Le tableau résultant du pavage.</para>
+                    Le tableau résultant du pavage.
+                    <para/>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection role="description">
         <title>Description</title>
         <para>
-            <literal>repmat(A,m,n)</literal> or de façon équivalente,
-            <literal>repmat(A,[m,n])</literal> retourne un grand tableau formé
-            d'un pavage <literal>m</literal>-par- <literal>n</literal> avec
-            des copies de <literal>A</literal>.  La taille du résultat est
-            <literal>[size(A,1)*M, size(A,2)*N]</literal>.
+            <emphasis role="bold">repmat(A, m)</emphasis> crée un pavage de
+            <literal>m</literal> × <literal>m</literal> copies concaténées
+            de <varname>A</varname>.
         </para>
         <para>
-            <literal>repmat(A,m)</literal> crée un pavage
-            <literal>m</literal>-by- <literal>m</literal>.
+            <emphasis role="bold">repmat(A, m, n)</emphasis> ou
+            <emphasis role="bold">repmat(A, [m, n])</emphasis> crée un pavage de
+            <literal>m</literal> × <literal>n</literal> copies concaténées de <varname>A</varname>.
         </para>
         <para>
-            <literal>repmat(A,[m n p ...])</literal> pave un tableau
-            mutidimensionnel <literal>m</literal>-par-
-            <literal>n</literal>-par- <literal>p</literal> ... avec des copies
-            de <literal>A</literal>. La taille du résultat est
-            <literal>[size(A,1)*M, size(A,2)*N, size(A,3)*P,
-                ...]
-            </literal>
-            .
+            <emphasis role="bold">repmat(A, m, n, p, ..)</emphasis> est une généralisation de
+            <emphasis role="bold">repmat(A, m, n)</emphasis>.
         </para>
-        <para>Cette fonction supporte les tableaux de réels, d'entiers, de
-            booléens, de chaînes de caractères, de polynômes, et de fractions
-            rationnelles ainsi que les matrices creuses. Cette fonction peut
-            être étendue en utilisant le méchanisme de surcharge.
+        <para>
+            <literal>repmat(…)</literal> étend <literal>ones(m,n,..) .*. A</literal>
+            aux tableaux <varname>A</varname> non numériques.
+        </para>
+        <para>
+             repmat(…) peut être définie pour d'autres types <varname>A</varname>
+             via le mécanisme de surcharge habituel.
         </para>
     </refsection>
     <refsection role="examples">
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-    repmat(1:3,2,2)
-    repmat(int8([1 0 1;0 1 0]),2,3,2)
-    repmat("Scilab",3,2)
-    t="Scilab";t(ones(3,2))
-    repmat([1/%s;2/(%s+1)],1,3)
+repmat([-1 3 7], 2, 4)
+
+repmat(int8([1 -2 3; 0 -1  1]), 2, 4, 2)
+
+b = cat(3, [%f %t %t], [%t %t %f])
+repmat(b, [2 3])
+
+t = "Scilab"; t(ones(2,4))
+repmat(["Scilab" "Xcos"], 2, 3)
+
+repmat([1/%s ; 2/(%s+1)], 1, 3)
+    ]]></programlisting>
+    <screen><![CDATA[
+--> repmat([-1 3 7], 2, 4)
+ ans  =
+  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.
+  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.
+
+
+--> repmat(int8([1 -2 3; 0 -1  1]), 2, 4, 2)
+ ans  =
+(:,:,1)
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+(:,:,2)
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+
+
+--> b = cat(3, [%f %t %t], [%t %t %f])
+ b  =
+(:,:,1)
+  F T T
+(:,:,2)
+  T T F
+
+--> repmat(b, [2 3])
+ ans  =
+(:,:,1)
+  F T T F T T F T T
+  F T T F T T F T T
+ (:,:,2)
+  T T F T T F T T F
+  T T F T T F T T F
+
+
+--> t = "Scilab"; t(ones(2,4))
+ ans  =
+  "Scilab"  "Scilab"  "Scilab"  "Scilab"
+  "Scilab"  "Scilab"  "Scilab"  "Scilab"
+
+--> repmat(["Scilab" "Xcos"], 2, 3)
+ ans  =
+  "Scilab"  "Xcos"  "Scilab"  "Xcos"  "Scilab"  "Xcos"
+  "Scilab"  "Xcos"  "Scilab"  "Xcos"  "Scilab"  "Xcos"
+
+
+--> repmat([1/%s ; 2/(%s+1)], 1, 3)
+ ans  =
+    1     1     1
+    -     -     -
+    s     s     s
 
- ]]></programlisting>
+    2     2     2
+   ----  ----  ----
+   1 +s  1 +s  1 +s
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="matrix">matrix</link>
+                <link linkend="kron">kron</link>
             </member>
             <member>
-                <link linkend="extraction">extraction</link>
+                <link linkend="ndgrid">ndgrid</link>
             </member>
             <member>
-                <link linkend="size">size</link>
+                <link linkend="insertion">insertion</link>
             </member>
         </simplelist>
     </refsection>
index 097ae94..6d4ac4a 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2020 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="squeeze">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="squeeze">
     <refnamediv>
         <refname>squeeze</refname>
-        <refpurpose>squeeze</refpurpose>
+        <refpurpose>supprime les dimensions singletons d'un tableau N-dimensionnel</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>hypOut = squeeze(hypIn)</synopsis>
+        <synopsis>r = squeeze(hypIn)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Paramètres</title>
+        <title>Arguments</title>
         <variablelist>
             <varlistentry>
                 <term>hypIn</term>
                 <listitem>
-                    <para>hypermatrice ou matrice réelle.</para>
+                    <para>
+                        Tableau N-dimensionnel de type natif quelconque (booléen, numérique, texte, ..,
+                        cellules, structures).
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>hypOut</term>
+                <term>r</term>
                 <listitem>
-                    <para>hypermatrcex ou matrice réelle.</para>
+                    <para>scalaire, vecteur, matrice ou tableau N-dimensionnel du même type.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
         <title>Description</title>
-        <para> Elimine les dimensions de type "singleton" d'une hypermatrice,
-            c'est-à -dire toutes les dimensions de taille 1.
-            Les matrices sont quant à  elles inchangées.
+        <para>
+            Elimine les dimensions singletons (= de taille 1) d'une hypermatrice ou d'un
+            tableau N-dimensionnel. Les matrices sont inchangées.
         </para>
     </refsection>
+    <refsection>
+        <title>Exemples</title>
+        <programlisting role="example"><![CDATA[
+// Pour une matrice 2D => aucun changement
+u = squeeze(ones(1,4))
+size(u)
+
+// auto-simplification des dimensions singletons les plus hautes :
+v = ones(2,3,1,1);
+size(v)
+
+// Pour un tableau d'entrée réellement N-dimensionnel :
+w = squeeze(ones(1,3,1,4))
+size(w)
+
+// Pour un tableau 4D de cellules :
+c = cat(4, {%t}, {%pi}, {"abc"});
+size(c)
+x = squeeze(c)
+size(x)
+    ]]></programlisting>
+    <screen><![CDATA[
+--> u = squeeze(ones(1,4))
+ u  =
+   1.   1.   1.   1.
+
+--> size(u)
+ ans  =
+   1.   4.
+
+--> // auto-simplification des dimensions singletons les plus hautes :
+--> v = ones(2,3,1,1);
+--> size(v)
+ ans  =
+   2.   3.
+
+-->  Pour un tableau d'entrée réellement N-dimensionnel :
+--> w = squeeze(ones(1,3,1,4))
+ w  =
+   1.   1.   1.   1.
+   1.   1.   1.   1.
+   1.   1.   1.   1.
+
+--> size(w)
+ ans  =
+   3.   4.
+
+--> // Pour un tableau 4D de cellules :
+--> c = cat(4, {%t}, {%pi}, {"abc"});
+--> size(c)
+ ans  =
+   1.   1.   1.   3.
+
+--> x = squeeze(c)
+ x  =
+  [1x1 boolean ]
+  [1x1 constant]
+  [1x1 string  ]
+
+--> size(x)
+ ans  =
+   3.   1.
+]]></screen>
+    </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
         <simplelist type="inline">
index 3681e49..3217987 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="sum" xml:lang="fr">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="sum" xml:lang="fr">
     <refnamediv>
         <refname>sum</refname>
-        <refpurpose>somme  des éléments d'un tableau.</refpurpose>
+        <refpurpose>somme des éléments d'un tableau.</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>y=sum(x)
-            y=sum(x,orientation)
-            y=sum(x,outtype)
-            y=sum(x,orientation,outtype)
+        <synopsis>
+            y = sum(x)
+            y = sum(x, orientation)
+            y = sum(x, outtype)
+            y = sum(x, orientation, outtype)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>un tableau de réels, de complexes, de booléens, de
-                        polynômes ou de fractions rationnelles.
-                    </para>
+                    Tableau de booléens (dense ou creux),  entiers encodés,
+                    nombres (dense ou creux), polynômes, ou fractions rationnelles.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>orientation</term>
                 <listitem>
-                    <para>
-                        Cet argument peut être
-                    </para>
+                    Cet argument peut être
                     <itemizedlist>
                         <listitem>
-                            <para>ou une chaîne de caractères pouvant avoir comme
-                                valeurs: <literal>"*"</literal>,
-                                <literal>"r"</literal>, <literal>"c"</literal> ou
-                                <literal>"m"</literal>
-                            </para>
+                            un caractère : <literal>"*"</literal>,
+                            <literal>"r"</literal>, <literal>"c"</literal> ou
+                            <literal>"m"</literal>
+                            <para/>
                         </listitem>
                         <listitem>
-                            <para>ou bien un nombre à valeur positive entière</para>
+                            un entier positif : n° de la dimension selon laquelle les sommes
+                            doivent être calculées.
+                            <para/>
                         </listitem>
                     </itemizedlist>
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>outtype</term>
                 <listitem>
-                    <para>
-                        une chaîne de caractères pouvant prendre les valeurs <literal>"native"</literal> ou <literal>"double"</literal>.
-                    </para>
+                    une chaîne de caractères pouvant prendre les valeurs
+                    <literal>"native"</literal> ou <literal>"double"</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para> un scalaire ou un tableau</para>
+                    un scalaire ou un tableau.
+                    <para/>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -206,6 +211,9 @@ sum(B,"native") //similar to or(B)
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
+                <link linkend="plus">plus</link>
+            </member>
+            <member>
                 <link linkend="cumsum">cumsum</link>
             </member>
             <member>
diff --git a/scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/repmat.xml b/scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/repmat.xml
deleted file mode 100644 (file)
index d4cc329..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2011 - INRIA - Serge Steer
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="repmat" xml:lang="ja">
-    <refnamediv>
-        <refname>repmat</refname>
-        <refpurpose>配列を複製/タイル状に配置</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>
-          B = repmat(A, siz)
-          B = repmat(A, m)
-          B = repmat(A, m, n,...)
-      </synopsis>
-    </refsynopsisdiv>
-    <refsection role="parameters">
-        <title>引数</title>
-        <variablelist>
-            <varlistentry>
-                <term>A</term>
-                <listitem>
-                    <para>入力二次元配列.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>m, n, ...</term>
-                <listitem>
-                    <para>
-                        整数で, <literal>B</literal>の各次元に関する
-                        <literal>A</literal> ブロックの数.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>siz</term>
-                <listitem>
-                    <para>
-                        整数ベクトルで, 各要素は<literal>B</literal>の対応する次元に
-                        関する<literal>A</literal>ブロックの数を指定する.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>B</term>
-                <listitem>
-                    <para>
-                        2次元配列<literal>A</literal>をタイル状に配置した
-                        配列.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection role="description">
-        <title>説明</title>
-        <para>
-            <literal>repmat(A,m,n)</literal> または同様な
-            <literal>repmat(A,[m,n])</literal> は,<literal>A</literal>の
-            <literal>m</literal> x <literal>n</literal> のタイル状の
-            コピーからなる大きな行列を返します.
-            結果の大きさは,<literal>[size(A,1)*M, size(A,2)*N]</literal>です.
-        </para>
-        <para>
-            <literal>repmat(A,m)</literal> は,
-            <literal>m</literal> x <literal>m</literal>のタイル状コピーを作成します.
-        </para>
-        <para>
-            <literal>repmat(A,[m n p ...])</literal> は,配列Aをタイル状に
-            コピーし,<literal>A</literal>のコピーからなる多次元配列を作成します.
-            結果の大きさは,
-            <literal>[size(A,1)*M, size(A,2)*N, size(A,3)*P, ...] </literal>となります.
-        </para>
-        <para>
-            現時点では,実数,整数,論理値,文字列,多項式,有理数および
-            疎行列の配列のみがサポートされています.
-            この関数の定義は,オーバーロード機能により拡張することができます.
-        </para>
-    </refsection>
-    <refsection role="examples">
-        <title>例</title>
-        <programlisting role="example"><![CDATA[
-    repmat(1:3,2,2)
-    repmat(int8([1 0 1;0 1 0]),2,3,2)
-    repmat("Scilab",3,2)
-    t="Scilab";t(ones(3,2))
-    repmat([1/%s;2/(%s+1)],1,3)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="matrix">matrix</link>
-            </member>
-            <member>
-                <link linkend="extraction">extraction</link>
-            </member>
-            <member>
-                <link linkend="size">size</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection role="history">
-        <title>履歴</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.3.1</revnumber>
-                <revremark>関数 repmat が導入されました.</revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/elementary_functions/help/ja_JP/matrixmanipulation/squeeze.xml b/scilab/modules/elementary_functions/help/ja_JP/matrixmanipulation/squeeze.xml
deleted file mode 100644 (file)
index 779acbd..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="squeeze">
-
-    <refnamediv>
-
-        <refname>squeeze</refname>
-
-        <refpurpose>ハイパー行列のシングルトン次元を削除</refpurpose>
-
-    </refnamediv>
-
-    <refsynopsisdiv>
-
-        <title>呼び出し手順</title>
-
-        <synopsis>hypOut = squeeze(hypIn)</synopsis>
-
-    </refsynopsisdiv>
-
-    <refsection>
-
-        <title>引数</title>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>hypIn</term>
-
-                <listitem>
-
-                    <para>定数型のハイパー行列または行列.</para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>hypOut</term>
-
-                <listitem>
-
-                    <para>定数型のハイパー行列または行列.</para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-    </refsection>
-
-    <refsection>
-
-        <title>説明</title>
-
-        <para>
-
-            <function>squeeze</function>は,
-
-            ハイパー行列のシングルトン次元を削除します.
-
-            これは,大きさが<literal>1</literal>の任意の次元を
-
-            削除することを意味します.
-
-            入力<varname>hypIn</varname>が行列の場合,変更されません.
-
-        </para>
-
-    </refsection>
-
-    <refsection>
-
-        <title>例</title>
-
-        <programlisting role="example"><![CDATA[
-       M1 = zeros(2,1,5)
-       squeeze(M1)
-       squeeze(M1(:,:,1))
-
-       M2 = matrix(1:4, [2 1 2 1])
-       squeeze(M2)
-       ]]></programlisting>
-
-    </refsection>
-
-    <refsection role="see also">
-
-        <title>参照</title>
-
-        <simplelist type="inline">
-
-            <member>
-                <link linkend="matrix">matrix</link>
-            </member>
-
-            <member>
-
-                <link linkend="hypermatrices">hypermatrices</link>
-
-            </member>
-
-        </simplelist>
-
-    </refsection>
-
-</refentry>
-
index 1ca2566..b35066a 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) 2008 - INRIA
  * along with this program.
  *
  -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="sum" xml:lang="ja">
-
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="sum" xml:lang="ja">
     <refnamediv>
-
         <refname>sum</refname>
-
         <refpurpose>配列要素の合計</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
-        <synopsis>y=sum(x)
-
-            y=sum(x,orientation)
-
-            y=sum(x,outtype)
-
-            y=sum(x,orientation,outtype)
-
+        <synopsis>
+            y = sum(x)
+            y = sum(x, outtype)
+            y = sum(x, orientation)
+            y = sum(x, orientation, outtype)
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>x</term>
-
                 <listitem>
-
                     <para>
-
-                        実数, 複素数, 論理値, 多項式または有理数の
-
-                        配列
-
+                      ブール(full or sparse), エンコードされた整数,
+                      実数または複素数(full or sparse),多項式, または有理数の配列.
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>orientation</term>
-
                 <listitem>
-
                     <para>
-
                         以下のどちらかを指定します
-
                     </para>
-
                     <itemizedlist>
-
                         <listitem>
-
                             <para>
-
                                 文字列で,指定可能な値は
-
                                 <literal>"*"</literal>, <literal>"r"</literal>,
-
                                 <literal>"c"</literal> または  <literal>"m"</literal>
-
                             </para>
-
                         </listitem>
-
                         <listitem>
-
                             <para>正の整数値</para>
-
                         </listitem>
-
                     </itemizedlist>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>outtype</term>
-
                 <listitem>
-
                     <para>
-
                         文字列で,指定可能な値は
-
                         <literal>"native"</literal> または
-
                         <literal>"double"</literal>.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>y</term>
-
                 <listitem>
-
                     <para>スカラーまたは配列</para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             配列<literal>x</literal>の場合,
-
             <literal>y=sum(x)</literal> は
-
             <literal>x</literal>の全要素の合計を
-
             スカラー<literal>y</literal>に返します.
-
         </para>
-
         <para>
-
             <literal>y=sum(x,orientation)</literal> は,
-
             <literal>orientation</literal>で指定した次元方向の
-
             <literal>x</literal>の合計を
-
             <literal>y</literal>に返します.
-
         </para>
-
         <itemizedlist>
-
             <listitem>
-
                 <para>
-
                     <literal>orientation</literal> が 1 または "r" の場合:
-
                 </para>
-
                 <para>
-
                     <latex><![CDATA[{ y(\mathbf{1},j) = \sum_{\mathbf{i}} x(\mathbf{i},j)}]]></latex>
-
                 </para>
-
                 <para>または </para>
-
                 <para>
-
                     <latex><![CDATA[ y(\mathbf{1},j,k,\ldots) = \sum_{\mathbf{i}} x(\mathbf{i},j,k,\ldots)]]></latex>
-
                 </para>
-
             </listitem>
-
             <listitem>
-
                 <para>
-
                     <literal>orientation</literal> が 2 または "c" の場合:
-
                 </para>
-
                 <para>
-
                     <latex><![CDATA[ y(i,\mathbf{1}) = \sum_{\mathbf{j}} x(i,\mathbf{j})]]></latex>
-
                 </para>
-
                 <para>または </para>
-
                 <para>
-
                     <latex><![CDATA[ y(i,\mathbf{1},k,\ldots) = \sum_{j} x(i,\mathbf{j},k,\ldots)]]></latex>
-
                 </para>
-
             </listitem>
-
             <listitem>
-
                 <para>
-
                     <literal>orientation</literal> がnの場合:
-
                 </para>
-
                 <para>
-
                     <latex><![CDATA[ y(i_1,\ldots,i_{n-1},\mathbf{1},i_{n+1},\ldots) = \sum_{\mathbf{i_n}} x(i_1,\ldots,i_{n-1},\mathbf{i_n},i_{n+1},\ldots)]]></latex>
-
                 </para>
-
             </listitem>
-
             <listitem>
-
                 <para>
-
                     <literal>y=sum(x,"*")</literal> は <literal>y=sum(x)</literal> と等価です.
-
                 </para>
-
             </listitem>
-
             <listitem>
-
                 <para>
-
                     <literal>y=sum(x,"m")</literal> は
-
                     <literal>y=sum(x,orientation)</literal> と等価です.
-
                     ただし,<literal>orientation</literal> は,
-
                     <literal>x</literal>の1より大きい最初の次元の添字です.
-
                 </para>
-
             </listitem>
-
         </itemizedlist>
-
         <para/>
-
         <para>
-
             <literal>outtype</literal>引数は合算の動作を指定します:
-
         </para>
-
         <itemizedlist>
-
             <listitem>
-
                 <para>
-
                     float, 多項式, 有理数の配列の場合,
-
                     評価は常に浮動小数点計算で行われます.
-
                     <literal>"double"</literal> または
-
                     <literal>"native"</literal> オプションは等価です.
-
                 </para>
-
             </listitem>
-
             <listitem>
-
                 <para>整数の配列の場合,</para>
-
                 <para>
-
                     <literal>outtype="native"</literal> の場合,
-
                     評価は整数比較(モジュロ 2^b, ただし b は使用されるビット数)
-
                     により行われます,
-
                 </para>
-
                 <para>
-
                     <literal>outtype="double"</literal> の場合,
-
                     評価は浮動小数点計算で行われます.
-
                 </para>
-
                 <para>
-
                     デフォルト値は <literal>outtype="native"</literal>です.
-
                 </para>
-
             </listitem>
-
             <listitem>
-
                 <para>論理値の配列の場合,</para>
-
                 <para>
-
                     <literal>outtype="native"</literal>の場合,
-
                     評価は論理値計算(+ は | で置換)により行われます,
-
                 </para>
-
                 <para>
-
                     <literal>outtype="double"</literal>の場合,
-
                     評価は浮動小数点計算で行われます
-
                     (%t は値1, %f は値0で置換されます).
-
                 </para>
-
                 <para>
-
                     デフォルト値は<literal>outtype="double"</literal>です.
-
                 </para>
-
             </listitem>
-
         </itemizedlist>
         <note>
             This function applies with identical rules to <link linkend="sparse">sparse matrices</link>
         </note>
-
     </refsection>
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
 A=[1,2;3,4];
 sum(A)
@@ -378,30 +210,19 @@ B=[%t %t %f %f];
 sum(B) //evaluation in float
 sum(B,"native") //similar to or(B)
  ]]></programlisting>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
+                <link linkend="plus">plus</link>
+            </member>
+            <member>
                 <link linkend="cumsum">cumsum</link>
-
             </member>
-
             <member>
-
                 <link linkend="prod">prod</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
diff --git a/scilab/modules/elementary_functions/help/pt_BR/matrixmanipulation/squeeze.xml b/scilab/modules/elementary_functions/help/pt_BR/matrixmanipulation/squeeze.xml
deleted file mode 100644 (file)
index bf29c62..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="squeeze" xml:lang="pt">
-    <refnamediv>
-        <refname>squeeze</refname>
-        <refpurpose>remoção de dimensões singletons</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>hypOut = squeeze(hypIn)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>hypIn</term>
-                <listitem>
-                    <para>hipermatriz ou matriz do tipo constante.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>hypOut</term>
-                <listitem>
-                    <para>hipermatriz ou matriz do tipo constante.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>Remove dimensões singletons de uma hipermatriz, i.e., qualquer
-            dimensão para a qual o tamanho é 1. Se a entrada é uma matriz, ela não é
-            afetada.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="matrix">matrix</link>
-            </member>
-            <member>
-                <link linkend="hypermatrices">hypermatrices</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>Autores</title>
-        <para>Eric Dubois, Jean-Baptiste Silvy</para>
-    </refsection>
-</refentry>
index 2acff61..3154b47 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="sum" xml:lang="pt">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="sum" xml:lang="pt">
     <refnamediv>
         <refname>sum</refname>
         <refpurpose>soma (soma linha, soma coluna) de entradas de um vetor ou
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>y=sum(x)
-            y=sum(x,'r') ou y=sum(x,1)
-
-            y=sum(x,'c') ou y=sum(x,2)
-
-            y=sum(x,'m')
+        <synopsis>
+            y = sum(x)
+            y = sum(x, outtype)
+            y = sum(x, orientation)
+            y = sum(x, orientation, outtype)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>vetor ou matriz (de reais, complexos, esparso(a) ou de
-                        polinômios)
-                    </para>
+                    Matriz ou hypermatriz de booleanos (densa ou esparsa), números inteiros codificados,
+                    números reais ou complexos (densa ou esparsa), polinômios ou racionais.
+                    <para/>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>orientation</term>
+                <listitem>
+                    it can be either
+                    <itemizedlist>
+                        <listitem>
+                            a character <literal>"*"</literal> (default), <literal>"r"</literal>,
+                          <literal>"c"</literal> or  <literal>"m"</literal>
+                        </listitem>
+                        <listitem>
+                            a positive integer: Index of the dimension along which the sums must be computed.
+                        </listitem>
+                    </itemizedlist>
+                    <para/>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>outtype</term>
+                <listitem>
+                    string <literal>"native"</literal> or <literal>"double"</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>escalar ou vetor </para>
+                    escalar ou vetor
+                    <para/>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Exemplos</title>
         <programlisting role="example"><![CDATA[
-A=[1,2;3,4];
-trace(A)-sum(diag(A))
-sum(A,'c')-A*ones(2,1)
-sum(A+%i)
-A=sparse(A);sum(A,'c')-A*ones(2,1)
-s=poly(0,'s');
-M=[s,%i+s;s^2,1];
-sum(M),sum(M,2)
+A = [1,2 ; 3,4];
+sum(A)
+sum(A,1)
+
+I = uint8([2 95 103;254 9 0])
+sum(I) // native evaluation
+sum(I, "double")
+sum(I, 2, "double")
+
+s = poly(0,"s");
+P = [s , %i+s ; s^2 , 1];
+sum(P)
+sum(P, 2)
+
+B = [%t %t %f %f];
+sum(B) //evaluation in float
+sum(B, "native") //similar to or(B)
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
+                <link linkend="plus">plus</link>
+            </member>
+            <member>
                 <link linkend="cumsum">cumsum</link>
             </member>
             <member>
index 08518ed..7a5d6a2 100644 (file)
             <varlistentry>
                 <term>c</term>
                 <listitem>
-                    Array of complex numbers, of the size of <varname>u</varname> or of
-                    <varname>a</varname> and <varname>b</varname>.
-                    If <varname>u</varname> is sparse, or if <varname>a</varname> and
-                    <varname>b</varname> have the same sizes and both are sparse,
+                    Массив комплексных чисел того же размера, что и <varname>u</varname> или
+                    <varname>a</varname> и <varname>b</varname>.
+                    Если <varname>u</varname> является разрежённой, либо если <varname>a</varname> и
+                    <varname>b</varname> имеют одинаковые размеры и обе являются разрежёнными,
                     то <varname>c</varname> является также разрежённой.
                     В противном случае <varname>c</varname> является плотной.
                     <para/>
index 4054aa5..3c90944 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2011 - INRIA - Serge Steer
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2020 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * 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="repmat" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="repmat" xml:lang="ru">
     <refnamediv>
         <refname>repmat</refname>
-        <refpurpose>Дублирование массива и его мозаичное размещение</refpurpose>
+        <refpurpose>дублирование массива и его мозаичное размещение</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
             B = repmat(A, m, n,...)
         </synopsis>
     </refsynopsisdiv>
-    <refsection role="parameters">
+    <refsection>
         <title>Аргументы</title>
         <variablelist>
             <varlistentry>
                 <term>A</term>
                 <listitem>
-                    <para>двумерный массив.</para>
+                    массив любого встроенного типа (логический, числовой, текстовый, ...,
+                    cell-массив, структура), любого количества размерностей и любых размеров.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>m, n, ...</term>
                 <listitem>
-                    <para>
-                        целые числа, количество блоков <literal>A</literal> для каждой
-                        размерности <literal>B</literal>.
-                    </para>
+                    целые числа, количество блоков <varname>A</varname> для каждой
+                    размерности <varname>B</varname>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>siz</term>
                 <listitem>
-                    <para>
-                        вектор целых чисел, каждый элемент указывает количество блоков
-                        <literal>A</literal> для соответствующей размерности
-                        <literal>B</literal>.
-                    </para>
+                    вектор числа репликаций: <literal>siz=[m,n,..]</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>B</term>
                 <listitem>
-                    <para>
-                        результирующая форма массива, полученная мозаичным размещением двумерного
-                        массива <literal>A</literal>.
-                    </para>
+                    массив или ND-мерный массив, полученный мозаичным размещением, размерами
+                    <literal>[m*size(A,1), n*size(A,2), ..]</literal> или
+                    <literal>[siz(1)*size(A,1), siz(2)*size(A,2), ..]</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection role="description">
         <title>Описание</title>
         <para>
-            <literal>repmat(A,m,n)</literal> или по-другому
-            <literal>repmat(A,[m,n])</literal> возвращает большую матрицу размером <literal>m</literal> на <literal>n</literal>, состоящую из мозаично размещённых
-            копий <literal>A</literal>. Размер результирующей матрицы равен <literal>[size(A,1)*M,
-                size(A,2)*N]
-            </literal>
-            .
+            <emphasis role="bold">repmat(A, m)</emphasis> реплицирует и мозаично размещает
+            <varname>m</varname> × <varname>m</varname> копий <varname>A</varname>.
+        </para>
+        <para>
+            <emphasis role="bold">repmat(A, m, n)</emphasis> или
+            <emphasis role="bold">repmat(A, [m, n])</emphasis> реплицирует и мозаично размещает
+            <varname>m</varname> × <varname>n</varname> копий <varname>A</varname>.
         </para>
         <para>
-            <literal>repmat(A,m)</literal> создаёт мозаичное размещение размером
-            <literal>m</literal> на <literal>m</literal>.
+            <emphasis role="bold">repmat(A, m, n, p, ..)</emphasis> является обобщением
+            <emphasis role="bold">repmat(A, m, n)</emphasis>.
         </para>
         <para>
-            <literal>repmat(A,[m n p ...])</literal> мозаично размещает массив
-            <literal>A</literal> так, чтобы получился многомерный массив, построенный из копий
-            <literal>A</literal>. Размер результата равен <literal>[size(A,1)*M, size(A,2)*N,
-                size(A,3)*P, ...]
-            </literal>
-            .
+            <literal>repmat(…)</literal> расширяет <literal>ones(m,n,..) .*. A</literal>
+            до нечисловых входных <varname>A</varname>.
         </para>
         <para>
-            На данный момент поддерживаются только массивы вещественных, целочисленных,
-            логических, строковых, полиномиальных и рациональных значений, а также разрежённые
-            матрицы. Это определение функции может быть расширено с помощью механизма перегрузки.
+             Определение <literal>repmat(…)</literal> может быть расширено с помощью механизма перегрузки.
         </para>
     </refsection>
     <refsection role="examples">
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-    repmat(1:3,2,2)
-    repmat(int8([1 0 1;0 1 0]),2,3,2)
-    repmat("Scilab",3,2)
-    t="Scilab";t(ones(3,2))
-    repmat([1/%s;2/(%s+1)],1,3)
+repmat([-1 3 7], 2, 4)
+
+repmat(int8([1 -2 3; 0 -1  1]), 2, 4, 2)
+
+b = cat(3, [%f %t %t], [%t %t %f])
+repmat(b, [2 3])
+
+t = "Scilab"; t(ones(2,4))
+repmat(["Scilab" "Xcos"], 2, 3)
+
+repmat([1/%s ; 2/(%s+1)], 1, 3)
+    ]]></programlisting>
+    <screen><![CDATA[
+--> repmat([-1 3 7], 2, 4)
+ ans  =
+  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.
+  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.  -1.   3.   7.
+
+
+--> repmat(int8([1 -2 3; 0 -1  1]), 2, 4, 2)
+ ans  =
+(:,:,1)
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+(:,:,2)
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+  1 -2  3  1 -2  3  1 -2  3  1 -2  3
+  0 -1  1  0 -1  1  0 -1  1  0 -1  1
+
+
+--> b = cat(3, [%f %t %t], [%t %t %f])
+ b  =
+(:,:,1)
+  F T T
+(:,:,2)
+  T T F
+
+--> repmat(b, [2 3])
+ ans  =
+(:,:,1)
+  F T T F T T F T T
+  F T T F T T F T T
+ (:,:,2)
+  T T F T T F T T F
+  T T F T T F T T F
+
+
+--> t = "Scilab"; t(ones(2,4))
+ ans  =
+  "Scilab"  "Scilab"  "Scilab"  "Scilab"
+  "Scilab"  "Scilab"  "Scilab"  "Scilab"
+
+--> repmat(["Scilab" "Xcos"], 2, 3)
+ ans  =
+  "Scilab"  "Xcos"  "Scilab"  "Xcos"  "Scilab"  "Xcos"
+  "Scilab"  "Xcos"  "Scilab"  "Xcos"  "Scilab"  "Xcos"
+
+
+--> repmat([1/%s ; 2/(%s+1)], 1, 3)
+ ans  =
+    1     1     1
+    -     -     -
+    s     s     s
 
- ]]></programlisting>
+    2     2     2
+   ----  ----  ----
+   1 +s  1 +s  1 +s
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="matrix">matrix</link>
+                <link linkend="kron">kron</link>
             </member>
             <member>
-                <link linkend="extraction">extraction</link>
+                <link linkend="ndgrid">ndgrid</link>
             </member>
             <member>
-                <link linkend="size">size</link>
+                <link linkend="insertion">вставка</link>
             </member>
         </simplelist>
     </refsection>
index f7cae19..58dc7b5 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2020 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * 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="squeeze">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="squeeze">
     <refnamediv>
         <refname>squeeze</refname>
-        <refpurpose>удаляет единичные размерности гиперматрицы</refpurpose>
+        <refpurpose>удаляет одиночные размерности ND-мерного массива</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>hypOut = squeeze(hypIn)</synopsis>
+        <synopsis>r = squeeze(hypIn)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
             <varlistentry>
                 <term>hypIn</term>
                 <listitem>
-                    <para>гиперматрица или матрица, тип constant.</para>
+                    <para>
+                        ND-мерный массив любого встроенного типа (логические,...
+                        cell-массив, структуры)
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>hypOut</term>
+                <term>r</term>
                 <listitem>
-                    <para>гиперматрица или матрица, тип constant.</para>
+                    <para>
+                        массив или ND-мерный массив того же самого типа.
+                    </para>
                 </listitem>
             </varlistentry>
         </variablelist>
     <refsection>
         <title>Описание</title>
         <para>
-            Функция <function>squeeze</function> удаляет единичные размерности гиперматрицы,
-            то есть любую размерность, величина которой равна <literal>1</literal>. Если
-            входной аргумент <varname>hypIn</varname> - обычная матрица, то эта функция не
-            оказывает влияния.
+            <literal>squeeze(…)</literal> удаляет одиночные размерности гиперматрицы
+            или ND-мерного массива, для которых размер равен <literal>1</literal>.
+            Если на входе <varname>hypIn</varname> является матрицей, то она возвращается
+            как есть.
         </para>
+        <note>
+            Scilab сжимает наивысшие одиночные размерности автоматически.
+        </note>
     </refsection>
     <refsection>
         <title>Примеры</title>
         <programlisting role="example"><![CDATA[
-       M1 = zeros(2,1,5)
-       squeeze(M1)
-       squeeze(M1(:,:,1))
+// для двумерных входных матриц => нет действий
+u = squeeze(ones(1,4))
+size(u)
+
+// автосжатие высших одиночных размерностей:
+v = ones(2,3,1,1);
+size(v)
+
+// для фактического входного ND-мерного массива:
+w = squeeze(ones(1,3,1,4))
+size(w)
+
+// для четырёхмерного cell-массива
+c = cat(4, {%t}, {%pi}, {"abc"});
+size(c)
+x = squeeze(c)
+size(x)
+    ]]></programlisting>
+    <screen><![CDATA[
+--> u = squeeze(ones(1,4))
+ u  =
+   1.   1.   1.   1.
+
+--> size(u)
+ ans  =
+   1.   4.
+
+--> // автосжатие высших одиночных размерностей:
+--> v = ones(2,3,1,1);
+--> size(v)
+ ans  =
+   2.   3.
+
+--> // для фактического входного ND-мерного массива:
+--> w = squeeze(ones(1,3,1,4))
+ w  =
+   1.   1.   1.   1.
+   1.   1.   1.   1.
+   1.   1.   1.   1.
+
+--> size(w)
+ ans  =
+   3.   4.
+
+
+--> // для четырёхмерного cell-массива
+--> c = cat(4, {%t}, {%pi}, {"abc"});
+--> size(c)
+ ans  =
+   1.   1.   1.   3.
+
+--> x = squeeze(c)
+ x  =
+  [1x1 boolean ]
+  [1x1 constant]
+  [1x1 string  ]
 
-       M2 = matrix(1:4, [2 1 2 1])
-       squeeze(M2)
-       ]]></programlisting>
+--> size(x)
+ ans  =
+   3.   1.
+]]></screen>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>
index 2110037..cec47b9 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="sum" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="sum" xml:lang="ru">
     <refnamediv>
         <refname>sum</refname>
         <refpurpose>сумма элементов массива</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>y=sum(x)
-            y=sum(x,orientation)
-            y=sum(x,outtype)
-            y=sum(x,orientation,outtype)
+        <synopsis>
+            y = sum(x)
+            y = sum(x, outtype)
+            y = sum(x, orientation)
+            y = sum(x, orientation, outtype)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>
-                        массив вещественных, комплексных, логических значений, полиномов или рациональных
-                        дробей.
-                    </para>
+                    Массив логических (плотных или разреженных), закодированных целых чисел,
+                    действительных или комплексных чисел (плотных или разреженных),
+                    полиномов или рациональных чисел.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>orientation</term>
                 <listitem>
-                    <para>
-                        (ориентация) может быть или
-                    </para>
+                    (ориентация) может быть или
                     <itemizedlist>
                         <listitem>
-                            <para>
-                                строкой с возможными значениями <literal>"*"</literal>, <literal>"r"</literal>,
-                                <literal>"c"</literal> или  <literal>"m"</literal>
-                            </para>
+                            строкой с возможными значениями <literal>"*"</literal> ("естественное"),
+                            <literal>"r"</literal>, <literal>"c"</literal> или  <literal>"m"</literal>
+                            <para/>
                         </listitem>
                         <listitem>
-                            <para>или целым положительным числом</para>
+                            или целым положительным числом
+                            <para/>
                         </listitem>
                     </itemizedlist>
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>outtype</term>
                 <listitem>
-                    <para>
-                        строка с возможными значениями <literal>"native"</literal> ("естественное")
-                        или <literal>"double"</literal>.
-                    </para>
+                    строка с возможными значениями <literal>"native"</literal> ("естественное")
+                    или <literal>"double"</literal>.
+                    <para/>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>y</term>
                 <listitem>
-                    <para>скаляр или массив</para>
+                    скаляр или массив
+                    <para/>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -204,6 +207,9 @@ sum(B,"native") //аналогично or(B)
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
+                <link linkend="plus">plus</link>
+            </member>
+            <member>
                 <link linkend="cumsum">cumsum</link>
             </member>
             <member>
index fb3fe1c..c9b41a5 100644 (file)
@@ -129,6 +129,6 @@ function B = repmat(A,varargin)
     if typeof(A) == "rational" then
         B = rlist(repmat(A.num,sizes), repmat(A.den,sizes), A.dt)
     else
-        execstr("B=%" + typeof(A) + "_repmat(A, sizes)")
+        execstr("B = %" + typeof(A, "overload") + "_repmat(A, sizes)")
     end
 endfunction
index 56e12d2..187e572 100644 (file)
@@ -80,7 +80,7 @@
 
                jcode = jinvoke(cb, "getRGB");
 
-               jremove System Color T c cb jcode;
+               jremove System Color String str T c cb jcode;
       ]]></programlisting>
     </refsection>
     <refsection role="see also">
index ff165dc..eb4ee76 100644 (file)
 
                jcode = jinvoke(cb, "getRGB");
 
-               jremove System Color T c cb jcode;
+               jremove System Color String str T c cb jcode;
       ]]></programlisting>
 
     </refsection>
index 1d69353..f440930 100644 (file)
                         (dash, dash dot, longdash dot, bigdash dot, bigdash longdash, dot, double dot, longblank dot, bigblank dot).
                         See example below.
                     </para>
+                    <scilab:image>
+                        plot2d([1 10], [1 1]'*(1:10), 2*ones(1,10));
+                        a = gca();
+                        a.children.children.line_style = (1:10)';
+                        a.children.children.thickness = 2;
+                        set(a, "axes_visible",["off" "on" "off"], "sub_ticks",[1 0]);
+                        a.margins(1) = 0.15;
+                        a.y_ticks=tlist(["ticks"  "locations"  "labels"],1:10,msprintf("%d\n",(1:10)')')
+                        ylabel("line_style value", "fontsize", 3)
+                        gcf().axes_size = [300 185];
+                    </scilab:image>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>mark_size: </term>
                 <listitem>
                     <para>
-                        The <literal>mark_size</literal> property is used to select the type of
-                        size of the marks when <literal>mark_mode</literal> property is
-                        <literal>"on"</literal>. Its value should be an integer between 0 and 5
-                        with stands for 8pt, 10pt, 12pt, 14pt, 18pt and 24pt.
+                        This property specifies the size of the marks displayed when the
+                        <literal>mark_mode</literal> property is <literal>"on"</literal>.
+                        If its value is scalar, the same mark size is set for all points of the curve.
+                        Otherwise it must be a row with as many elements as there are points in the curve.
+                        The type of values depends on the <literal>mark_size_unit</literal> property.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>mark_foreground: </term>
                 <listitem>
                     <para>
-                        This field contains the <literal>mark_foreground</literal> property
-                        value which is the marks' edge color. Its value should be a color
-                        index (relative to the current color_map) or 0 for transparent edge.
+                        This property specifies the color of the edges or details of marks. Acceptable
+                        values are indices of colors in the current figure's colormap, or -2 for white,
+                        -1 for black, or 0 for transparent edges. If its value is scalar, the same
+                        specified color is used for the marks of all points of the curve.
+                        Otherwise it must be a row with as many elements as there are points in the curve.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>mark_background: </term>
                 <listitem>
                     <para>
-                        This field contains the <literal>mark_background</literal> property
-                        value which is the marks' face color. Its value should be a color
-                        index (relative to the current color_map) or 0 for transparent face.
+                        This property specifies the color filling the background of marks. Acceptable
+                        values are indices of colors in the current figure's colormap, or -2 for white,
+                        -1 for black, or 0 for transparent edges. If its value is scalar, the same
+                        specified color is used for the marks of all points of the curve.
+                        Otherwise it must be a row with as many elements as there are points in the curve.
                     </para>
                 </listitem>
             </varlistentry>
@@ -522,44 +538,24 @@ p.line_style=4;
             p.polyline_style=3;
             p.line_style=4;
         </scilab:image>
-        <programlisting role="example"><![CDATA[
-// Example for line_style property
-clf();
-f=gcf();
-for i=1:10
-    plot2d(1:10, i*ones([1:10]), 2);
-    // Change line_style:
-    f.children.children(1).children.line_style = i;
-    f.children.children(1).children.thickness = 2;
-end
-f.children.axes_visible = ["off","on","off"];
-f.children.y_label.text = "line_style value";
-f.children.y_label.font_size = 3;
- ]]></programlisting>
-        <scilab:image>
-            clf();
-            f=gcf();
-            for i=1:10
-            plot2d(1:10, i*ones([1:10]), 2);
-            f.children.children(1).children.line_style = i;
-            f.children.children(1).children.thickness = 2;
-            end
-            f.children.axes_visible = ["off","on","off"];
-            f.children.y_label.text = "line_style value";
-            f.children.y_label.font_size = 3;
-        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="set">set</link>
+                <link linkend="champ_properties">champ_properties</link>
             </member>
             <member>
-                <link linkend="get">get</link>
+                <link linkend="param3d_properties">param3d_properties</link>
+            </member>
+            <member>
+                <link linkend="plot">plot</link>
+            </member>
+            <member>
+                <link linkend="set">set</link>
             </member>
             <member>
-                <link linkend="delete">delete</link>
+                <link linkend="get">get</link>
             </member>
             <member>
                 <link linkend="xpoly">xpoly</link>
@@ -610,7 +606,16 @@ f.children.y_label.font_size = 3;
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                  <para>New property <literal>.datatip_display_mode</literal> introduced.</para>
+                    <itemizedlist>
+                        <listitem>
+                            New property <literal>.datatip_display_mode</literal> introduced.
+                        </listitem>
+                        <listitem>
+                            <literal>.mark_foreground</literal>, <literal>.mark_background</literal>
+                            and <literal>.mark_size</literal> can now be row vectors: Each point
+                            can have its own individual mark colors and size.
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
index 9bc6aa6..9dd035f 100644 (file)
                     <para>
                         <itemizedlist>
                             <listitem>
-                                <literal>"on"</literal> : If <literal>.box="on"</literal>, the line
-                                of the box is drawn (frame).
+                                <literal>"on"</literal> : draws a line as box border,
+                                provided that <literal>.box="on"</literal> as well.
+                                The border's color is then set with <literal>.foreground</literal>.
                             </listitem>
                             <listitem>
-                                <literal>"off"</literal> : If <literal>.box="on"</literal>, the box
-                                is drawn without surrounding frame (only with its filling color).
+                                <literal>"off"</literal> : no line as box border is drawn.
+                                The box's filling background is independently enabled/disabled
+                                with the <literal>.fill_mode</literal> property.
                             </listitem>
                         </itemizedlist>
                     </para>
             <varlistentry>
                 <term>foreground: </term>
                 <listitem>
-                    <para>Color index of the line used to draw the edge of the box, when
-                    <literal>.line_mode</literal> is turned on. Its value refers to the current
-                       colormap. <literal>-1</literal> is black (default) and <literal>-2</literal>
-                       is white whatever is the colormap.
+                    <para>
+                        Color's index of the line used to draw the edge of the box when
+                        <literal>.box="on"</literal> and <literal>.line_mode="on"</literal>.
+                        Its value refers to the current colormap. <literal>-1</literal> is black
+                        (default) and <literal>-2</literal> is white whatever is the colormap.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>fill_mode: </term>
                 <listitem>
                     <para>
-                        This boolean property allows to draw or not the background of the box
-                        when the <literal>box</literal> property is <literal>"on"</literal>.
-                        If <literal>fill_mode</literal> is <literal>"off"</literal>, the
-                        background of the box is not transparent.
+                        <literal>"on"</literal>: enables the box background, provided that
+                        <literal>.box="on"</literal> as well. The background's color can
+                        then be set with the <literal>.background</literal> property.
+                   </para>
+                    <para>
+                      <literal>"off"</literal> (default): disables the box background,
+                      that becomes transparent.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>background: </term>
                 <listitem>
-                    <para>This field contains the color used to fill the box around of the
-                        text. Its value should be a color index (relative to the current
-                        colormap).
+                    <para>
+                        Index of the color used to fill the box around of the text,
+                        provided that <literal>.box="on"</literal> and
+                        <literal>.fill_mode="on"</literal>. The color index is relative
+                        to the current colormap. Whatever is the colormap,
+                        <literal>-1</literal> is black (default) and <literal>-2</literal>
+                        is white.
                     </para>
                 </listitem>
             </varlistentry>
index 4bca8df..daea41f 100644 (file)
                         (破線, 一点鎖線, 長一点鎖線, 大鎖線, 大長一点鎖線, 点線, 2重点線, 長空白点線, 大空白点線)
                         の選択を意味します. 以下の例を参照ください.
                     </para>
+                    <scilab:image>
+                        plot2d([1 10], [1 1]'*(1:10), 2*ones(1,10));
+                        a = gca();
+                        a.children.children.line_style = (1:10)';
+                        a.children.children.thickness = 2;
+                        set(a, "axes_visible",["off" "on" "off"], "sub_ticks",[1 0]);
+                        a.margins(1) = 0.15;
+                        a.y_ticks=tlist(["ticks"  "locations"  "labels"],1:10,msprintf("%d\n",(1:10)')')
+                        ylabel("line_style value", "fontsize", 3)
+                        gcf().axes_size = [300 185];
+                    </scilab:image>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>mark_size: </term>
                 <listitem>
                     <para>
-                        <literal>mark_size</literal>プロパティは,
-                        <literal>mark_mode</literal>プロパティが<literal>"on"</literal>の時,
-                        マーカの大きさを選択するために使用されます.
-                        この値は, 8pt, 10pt, 12pt, 14pt, 18pt および 24pt を意味する
-                        [0 5]の範囲の整数です.
+                        This property specifies the size of the marks displayed when the
+                        <literal>mark_mode</literal> property is <literal>"on"</literal>.
+                        If its value is scalar, the same mark size is set for all points of the curve.
+                        Otherwise it must be a row with as many elements as there are points in the curve.
+                        The type of values depends on the <literal>mark_size_unit</literal> property.
                     </para>
                 </listitem>
             </varlistentry>
                 <term>mark_foreground: </term>
                 <listitem>
                     <para>
-                        このフィールドは,マーカの縁の色である<literal>mark_foreground</literal>
-                        プロパティの値を有します.この値は(カレントのcolor_mapに関連する)色インデックス
-                        または透過エッジを意味する 0 とします.
+                        This property specifies the color of the edges or details of marks. Acceptable
+                        values are indices of colors in the current figure's colormap, or -2 for white,
+                        -1 for black, or 0 for transparent edges. If its value is scalar, the same
+                        specified color is used for the marks of all points of the curve.
+                        Otherwise it must be a row with as many elements as there are points in the curve.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>mark_background: </term>
                 <listitem>
-                    <para>このフィールドは,マーカの前景色である
-                        <literal>mark_background</literal>プロパティの値を有します.
-                        この値は(カレントのcolor_mapに関連する)色インデックス
-                        または透過エッジを意味する 0 とします.
+                    <para>
+                        This property specifies the color filling the background of marks. Acceptable
+                        values are indices of colors in the current figure's colormap, or -2 for white,
+                        -1 for black, or 0 for transparent edges. If its value is scalar, the same
+                        specified color is used for the marks of all points of the curve.
+                        Otherwise it must be a row with as many elements as there are points in the curve.
                     </para>
                 </listitem>
             </varlistentry>
@@ -539,44 +554,24 @@ p.line_style=4;
             p.polyline_style=3;
             p.line_style=4;
         </scilab:image>
-        <programlisting role="example"><![CDATA[
-// line_styleプロパティの例
-clf();
-f=gcf();
-for i=1:10
-    plot2d(1:10, i*ones([1:10]), 2);
-    // line_styleを変更:
-    f.children.children(1).children.line_style = i;
-    f.children.children(1).children.thickness = 2;
-end
-f.children.axes_visible = ["off","on","off"];
-f.children.y_label.text = "line_style value";
-f.children.y_label.font_size = 3;
- ]]></programlisting>
-        <scilab:image>
-            clf();
-            f=gcf();
-            for i=1:10
-            plot2d(1:10, i*ones([1:10]), 2);
-            f.children.children(1).children.line_style = i;
-            f.children.children(1).children.thickness = 2;
-            end
-            f.children.axes_visible = ["off","on","off"];
-            f.children.y_label.text = "line_style value";
-            f.children.y_label.font_size = 3;
-        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>参照</title>
         <simplelist type="inline">
             <member>
-                <link linkend="set">set</link>
+                <link linkend="champ_properties">champ_properties</link>
             </member>
             <member>
-                <link linkend="get">get</link>
+                <link linkend="param3d_properties">param3d_properties</link>
             </member>
             <member>
-                <link linkend="delete">delete</link>
+                <link linkend="plot">plot</link>
+            </member>
+            <member>
+                <link linkend="set">set</link>
+            </member>
+            <member>
+                <link linkend="get">get</link>
             </member>
             <member>
                 <link linkend="xpoly">xpoly</link>
@@ -626,7 +621,16 @@ f.children.y_label.font_size = 3;
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                  <para>New property <literal>.datatip_display_mode</literal> introduced.</para>
+                    <itemizedlist>
+                        <listitem>
+                            New property <literal>.datatip_display_mode</literal> introduced.
+                        </listitem>
+                        <listitem>
+                            <literal>.mark_foreground</literal>, <literal>.mark_background</literal>
+                            and <literal>.mark_size</literal> can now be row vectors: Each point
+                            can have its own individual mark colors and size.
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
index 3bbba19..5c9acc7 100644 (file)
                 <term>fill_mode: </term>
                 <listitem>
                     <para>
-                        この論理値プロパティにより,<literal>box</literal> プロパティが
-                        <literal>"on"</literal>の時にボックスの背景を塗りつぶすかどうかを指定できます.
-                        <literal>fill_mode</literal> が <literal>"off"</literal>の場合,
-                        ボックスの背景は透明ではありません..
+                        <literal>"on"</literal>: enables the box background, provided that
+                        <literal>.box="on"</literal> as well. The background's color can
+                        then be set with the <literal>.background</literal> property.
+                    </para>
+                    <para>
+                      <literal>"off"</literal> (default): disables the box background,
+                      that becomes transparent.
                     </para>
                 </listitem>
             </varlistentry>
index 90d9da7..4b63ac4 100644 (file)
@@ -976,9 +976,9 @@ polarplot_1.png=92b1189dd351372e587b472bad213e09
 polarplot_2.png=7a5f1cd3ef07687170c0de62231a2b5c
 polarplot_3.png=f11a25552a72c4454001c29b97073379
 polarplot_4.png=a4df61be3e5a6aa65eb22ab44e9dc5d3
-polyline_properties_1.png=5458d2f7efc2756fbb364a80e066588f
-polyline_properties_2.png=3349e39fe563e09fc488e9ed03c6e4ae
-polyline_properties_3.png=0c758a8eb88f3a7383151da8a94cf808
+polyline_properties_1.png=97b2785c2aba9ceec1c15af7aef25423
+polyline_properties_2.png=5458d2f7efc2756fbb364a80e066588f
+polyline_properties_3.png=3349e39fe563e09fc488e9ed03c6e4ae
 prbs_a_1.png=4e8551544fa2d2085e74ddfe799ec579
 prbs_a_2.png=ef716bac583e1660fe1f49a4352b7b4b
 prettyprint_1.png=5d60f609825ec81746672b39278e27ad
index f28e4df..2982af2 100644 (file)
Binary files a/scilab/modules/helptools/images/polyline_properties_1.png and b/scilab/modules/helptools/images/polyline_properties_1.png differ
index 1ec0d09..f28e4df 100644 (file)
Binary files a/scilab/modules/helptools/images/polyline_properties_2.png and b/scilab/modules/helptools/images/polyline_properties_2.png differ
index 91c73c5..1ec0d09 100644 (file)
Binary files a/scilab/modules/helptools/images/polyline_properties_3.png and b/scilab/modules/helptools/images/polyline_properties_3.png differ