* Bug 10723 fixed [doc]: subplot() page improved 57/20957/6
Samuel GOUGEON [Fri, 19 Apr 2019 22:34:20 +0000 (00:34 +0200)]
  http://bugzilla.scilab.org/10723
  New page (PDF): http://bugzilla.scilab.org/attachment.cgi?id=4942

  CHANGES:
   - Short description improved
   - Description improved as proposed in comments
   - 2nd example added, illustrating a more complex layout
   - See also: overhauled

Change-Id: I72b6ae727904d190368e6bc2c84fcd009607c5fa

scilab/CHANGES.md
scilab/modules/graphics/help/en_US/axes_operations/subplot.xml
scilab/modules/graphics/help/fr_FR/axes_operations/subplot.xml
scilab/modules/graphics/help/ja_JP/axes_operations/subplot.xml
scilab/modules/graphics/help/ru_RU/axes_operations/subplot.xml [new file with mode: 0644]
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/subplot_2.png [new file with mode: 0644]
scilab/modules/helptools/images/subplot_ru_RU_2.png [new file with mode: 0644]

index f219f04..2b5a9fd 100644 (file)
@@ -178,6 +178,7 @@ Bug Fixes
 * [#9529](http://bugzilla.scilab.org/show_bug.cgi?id=9529): `assert_checkequal(list(1,,3), list(1,,3))` yielded an error.
 * [#9673](http://bugzilla.scilab.org/show_bug.cgi?id=9673): Priority of colon `:` operator was too low
 * [#10353](http://bugzilla.scilab.org/show_bug.cgi?id=10353): Documentation: The referential for the uicontrol.position property was not provided. Moreover, gca().axes_bounds refered to fig.figure_size instead of fig.axes_size.
+* [#10723](http://bugzilla.scilab.org/show_bug.cgi?id=10723): `subplot`'s action was unclearly described in its help page. Page improved.
 * [#11852](http://bugzilla.scilab.org/show_bug.cgi?id=11852): File browser didn't update after file creation or remove.
 * [#12520](http://bugzilla.scilab.org/show_bug.cgi?id=12520): Vriable browser did not display the size of the variables.
 * [#12534](http://bugzilla.scilab.org/show_bug.cgi?id=12534): Variable browser did not display the size of the variables.
index 1bf9d44..4bd3cc4 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2019 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * 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="subplot">
+<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="subplot">
     <refnamediv>
         <refname>subplot</refname>
-        <refpurpose>virtually grids the figure and sets the plotting area to a chosen cell</refpurpose>
+        <refpurpose>sets the current axes to a chosen cell of the current gridded figure</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>subplot(m,n,p)
+        <synopsis>
+            subplot(m,n,p)
             subplot(mnp)
         </synopsis>
     </refsynopsisdiv>
@@ -28,7 +32,7 @@
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>m,n,p</term>
+                <term>m, n, p</term>
                 <listitem>
                     <para>positive integers</para>
                 </listitem>
     <refsection>
         <title>Description</title>
         <para>
-            subplot(m,n,p) or subplot(mnp) breaks the graphics window
-            into an m-by-n matrix of sub-windows and selects the p-th sub-window
-            for drawing  the current plot.  The number of a sub-window into the
-            matrices is counted row by row ie the sub-window corresponding to element
-            (i,j) of the matrix has number (i-1)*n + j.
+            subplot(m,n,p) or subplot(mnp) virtually grids the graphics window into an m-by-n
+            matrix of sub-windows, and selects the p<superscript>th</superscript> sub-window
+            for receiving the forthcoming drawings.
+        </para>
+        <para>
+            Into the grid, cells are indexed along each row, starting from the top row.
+            Hence, for instance the last cell of the first row is the p = n<superscript>th</superscript>
+            one. The cell on the row #i and the column #j has the index <literal>p=(i-1)*n+j</literal>.
+        </para>
+        <para>
+            When the selected area matches exactly an existing axes, <literal>subplot(…)</literal>
+            just sets it as the current axes, and returns.
+        </para>
+        <para>
+            Otherwise, <literal>subplot(…)</literal> creates an empty axes covering the selected area,
+            ready to receive forthcoming plotting contents.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-subplot(221)
-plot2d()
-subplot(222)
-plot3d()
-subplot(2,2,3)
-param3d()
-subplot(2,2,4)
-hist3d()
+            clf
+            subplot(221)
+            plot2d()
+
+            subplot(222)
+            plot3d()
+
+            subplot(2,2,3)
+            param3d()
+
+            subplot(2,2,4)
+            hist3d()
  ]]></programlisting>
         <scilab:image>
             subplot(221)
@@ -75,21 +94,66 @@ hist3d()
             subplot(2,2,4)
             hist3d()
         </scilab:image>
+        <para/>
+        <para>
+            <emphasis role="bold">A more complex layout</emphasis>, but still gridable:
+        </para>
+        <programlisting role="example"><![CDATA[
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Matplot1() example","","")
+
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
+
+            subplot(2,2,3)
+            title("Smaller plots:", "fontsize",3)
+
+            subplot(2,4,5)
+            polarplot()
+
+            subplot(2,4,6)
+            param3d()
+            xtitle("","","","")
+ ]]></programlisting>
+        <scilab:image>
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Matplot1() example","","")
+
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
+
+            subplot(2,2,3)
+            title("Smaller plots:", "fontsize",3)
+
+            subplot(2,4,5)
+            polarplot()
+
+            subplot(2,4,6)
+            param3d()
+            xtitle("","","","")
+            gcf().axes_size = [670 400];
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="plot2d">plot2d</link>
+                <link linkend="xsetech">xsetech</link>
             </member>
             <member>
-                <link linkend="plot3d">plot3d</link>
+                <link linkend="newaxes">newaxes</link>
             </member>
             <member>
-                <link linkend="xstring">xstring</link>
+                <link linkend="axes_properties">axes_properties</link>
             </member>
             <member>
-                <link linkend="xtitle">xtitle</link>
+                <link linkend="plotframe">plotframe</link>
             </member>
         </simplelist>
     </refsection>
index f8b9954..67cc8b3 100644 (file)
@@ -1,12 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="fr" xml:id="subplot">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2019 - Samuel GOUGEON
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="subplot">
     <refnamediv>
         <refname>subplot</refname>
-        <refpurpose>quadrille virtuellement la figure et fixe la zone de dessin dans une case choisie</refpurpose>
+        <refpurpose>
+            fixe le repère graphique actif dans une case choisie de la figure courante quadrillée
+        </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>subplot(m,n,p)
+        <synopsis>
+            subplot(m,n,p)
             subplot(mnp)
         </synopsis>
     </refsynopsisdiv>
@@ -14,7 +34,7 @@
         <title>Paramètres</title>
         <variablelist>
             <varlistentry>
-                <term>m,n,p  </term>
+                <term>m, n, p  </term>
                 <listitem>
                     <para>entiers positifs
                     </para>
         <title>Description</title>
         <para>
             subplot(m,n,p) ou subplot(mnp) divise la fenêtre graphique courante
-            en une matrice m x n matrice de sous fenêtres et sélectionne la p-ième sous-fenêtre
-            comme emplacement de dessin par défaut.  Le numéro de la sous-fenêtre
+            en une matrice m x n de sous fenêtres, et sélectionne la p-ième sous-fenêtre
+            comme zone de dessin active.  Le numéro de la sous-fenêtre
             est compté ligne par ligne, c'est à dire que l'emplacement
             (i,j) de la matrice porte le numéro (i-1)*n + j.
         </para>
+        <para>
+            Dans la grille virtuelle de sous-fenêtres, les zones sont numérotées de la gauche vers
+            la droite, et de haut en bas. Ainsi, la dernière zone à droite sur la 1ère ligne a
+            le n° p = n. La zone située sur la ligne n°i colonne n°j est la n°
+            <literal>p=(i-1)*n+j</literal>.
+        </para>
+        <para>
+            Lorsque la zone sélectionnée correspond exactement à celle d'un repère graphique existant,
+            <literal>subplot(…)</literal> fixe celui-ci comme repère actif.
+        </para>
+        <para>
+            Sinon, <literal>subplot(…)</literal> crée un repère graphique vide couvrant la zone
+            sélectionnée, prêt à recevoir les graphiques à venir.
+        </para>
     </refsection>
     <refsection>
         <title>Exemples</title>
         <programlisting role="example"><![CDATA[
-subplot(221)
-plot2d()
-subplot(222)
-plot3d()
-subplot(2,2,3)
-param3d()
-subplot(2,2,4)
-hist3d()
+            clf
+            subplot(221)
+            plot2d()
+
+            subplot(222)
+            plot3d()
+
+            subplot(2,2,3)
+            param3d()
+
+            subplot(2,2,4)
+            hist3d()
  ]]></programlisting>
         <scilab:image>
             subplot(221)
@@ -62,21 +100,66 @@ hist3d()
             subplot(2,2,4)
             hist3d()
         </scilab:image>
+        <para/>
+        <para>
+            <emphasis role="bold">Placements plus complexes</emphasis>, mais toujours quadrillables :
+        </para>
+        <programlisting role="example"><![CDATA[
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Matplot1() example","","")
+
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
+
+            subplot(2,2,3)
+            title("Smaller plots:", "fontsize",3)
+
+            subplot(2,4,5)
+            polarplot()
+
+            subplot(2,4,6)
+            param3d()
+            xtitle("","","","")
+ ]]></programlisting>
+        <scilab:image>
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Matplot1() example","","")
+
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
+
+            subplot(2,2,3)
+            title("Smaller plots:", "fontsize",3)
+
+            subplot(2,4,5)
+            polarplot()
+
+            subplot(2,4,6)
+            param3d()
+            xtitle("","","","")
+            gcf().axes_size = [670 400];
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>Voir aussi</title>
         <simplelist type="inline">
             <member>
-                <link linkend="plot2d">plot2d</link>
+                <link linkend="xsetech">xsetech</link>
             </member>
             <member>
-                <link linkend="plot3d">plot3d</link>
+                <link linkend="newaxes">newaxes</link>
             </member>
             <member>
-                <link linkend="xstring">xstring</link>
+                <link linkend="axes_properties">axes_properties</link>
             </member>
             <member>
-                <link linkend="xtitle">xtitle</link>
+                <link linkend="plotframe">plotframe</link>
             </member>
         </simplelist>
     </refsection>
index f247b63..e06e24a 100644 (file)
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) INRIA
-
- *
-
-
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2019 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
  * 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="subplot">
-
+<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="subplot">
     <refnamediv>
-
         <refname>subplot</refname>
-
         <refpurpose>グラフィックウインドウをサブウインドウの行列に分割する</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
-        <synopsis>subplot(m,n,p)
-
+        <synopsis>
+            subplot(m,n,p)
             subplot(mnp)
-
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
-                <term>m,n,p</term>
-
+                <term>m, n, p</term>
                 <listitem>
-
                     <para>正の整数</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>mnp</term>
-
                 <listitem>
-
                     <para>
-
                         10進表記の整数 <literal>mnp</literal>
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             subplot(m,n,p) または subplot(mnp) はグラフィックウインドウを
-
             m行n列のサブウインドウの行列に分割し,
-
             p番目のサブウインドウを描画先として選択します.
-
             サブウインドウの番号は,行優先でカウント,つまり,
-
             行列の要素(i,j)に対応するサブウインドウは(i-1)*n + j番となります.
-
         </para>
-
+        <para>
+            When the selected area matches exactly an existing axes, <literal>subplot(…)</literal>
+            just sets it as the current axes, and returns.
+        </para>
+        <para>
+            Otherwise, <literal>subplot(…)</literal> creates an empty axes covering the selected area,
+            ready to receive forthcoming plotting contents.
+        </para>
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
+            clf
+            subplot(221)
+            plot2d()
 
-subplot(221)
-
-plot2d()
-
-subplot(222)
-
-plot3d()
-
-subplot(2,2,3)
-
-param3d()
-
-subplot(2,2,4)
+            subplot(222)
+            plot3d()
 
-hist3d()
+            subplot(2,2,3)
+            param3d()
 
+            subplot(2,2,4)
+            hist3d()
  ]]></programlisting>
-
         <scilab:image>
-
             subplot(221)
-
             plot2d()
-
             subplot(222)
-
             plot3d()
+            subplot(2,2,3)
+            param3d()
+            subplot(2,2,4)
+            hist3d()
+        </scilab:image>
+        <para/>
+        <para>
+            <emphasis role="bold">A more complex layout</emphasis>, but still gridable:
+        </para>
+        <programlisting role="example"><![CDATA[
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Matplot1() example","","")
+
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
 
             subplot(2,2,3)
+            title("Smaller plots:", "fontsize",3)
 
+            subplot(2,4,5)
+            polarplot()
+
+            subplot(2,4,6)
             param3d()
+            xtitle("","","","")
+ ]]></programlisting>
+        <scilab:image>
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Matplot1() example","","")
 
-            subplot(2,2,4)
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
 
-            hist3d()
+            subplot(2,2,3)
+            title("Smaller plots:", "fontsize",3)
 
-        </scilab:image>
+            subplot(2,4,5)
+            polarplot()
 
+            subplot(2,4,6)
+            param3d()
+            xtitle("","","","")
+            gcf().axes_size = [670 400];
+        </scilab:image>
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
-                <link linkend="plot2d">plot2d</link>
-
+                <link linkend="xsetech">xsetech</link>
             </member>
-
             <member>
-
-                <link linkend="plot3d">plot3d</link>
-
+                <link linkend="newaxes">newaxes</link>
             </member>
-
             <member>
-
-                <link linkend="xstring">xstring</link>
-
+                <link linkend="axes_properties">axes_properties</link>
             </member>
-
             <member>
-
-                <link linkend="xtitle">xtitle</link>
-
+                <link linkend="plotframe">plotframe</link>
             </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
diff --git a/scilab/modules/graphics/help/ru_RU/axes_operations/subplot.xml b/scilab/modules/graphics/help/ru_RU/axes_operations/subplot.xml
new file mode 100644 (file)
index 0000000..66c221c
--- /dev/null
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2019 - Samuel GOUGEON
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="subplot">
+    <refnamediv>
+        <refname>subplot</refname>
+        <refpurpose>
+            устанавливает текущие оси для выбора ячейки текущей разграфлённой фигуры
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Синтаксис</title>
+        <synopsis>
+            subplot(m,n,p)
+            subplot(mnp)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Аргументы</title>
+        <variablelist>
+            <varlistentry>
+                <term>m, n, p</term>
+                <listitem>
+                    <para>положительные целые числа</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>mnp</term>
+                <listitem>
+                    <para>
+                        целое число с десятичной нотацией <literal>mnp</literal>
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Описание</title>
+        <para>
+            <literal>subplot(m,n,p)</literal> или <literal>subplot(mnp)</literal> виртуально
+            разделяет графическое окно на матрицу подокон размером m-на-n, и выбирает
+            <varname>p</varname>-тое подокно для получения следующего графика.
+        </para>
+        <para>
+            В сетке, где ячейки индексированы вдоль каждого ряда, начиная с верхнего.
+            Следовательно, например, последняя ячейка первого ряда <varname>p</varname> будет
+            <varname>n</varname>-ной ячейкой. Ячейка в ряду №i и в столбце №j имеет индекс
+            <literal>p=(i-1)*n+j</literal>.
+        </para>
+        <para>
+            Когда выбранная зона точно соответствует существующим осям, то
+            <literal>subplot(…)</literal> просто устанавливает её в качестве текущих осей.
+        </para>
+        <para>
+            В противном случае <literal>subplot(…)</literal> создаёт пустые оси, по всей
+            выбранной зоне, готовые для получения следующего графического содержимого.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="example"><![CDATA[
+            clf
+            subplot(221)
+            plot2d()
+
+            subplot(222)
+            plot3d()
+
+            subplot(2,2,3)
+            param3d()
+
+            subplot(2,2,4)
+            hist3d()
+ ]]></programlisting>
+        <scilab:image>
+            subplot(221)
+            plot2d()
+            subplot(222)
+            plot3d()
+            subplot(2,2,3)
+            param3d()
+            subplot(2,2,4)
+            hist3d()
+        </scilab:image>
+        <para/>
+        <para>
+            <emphasis role="bold">Более сложная компоновка</emphasis>, но по-прежнему разграфлённая:
+        </para>
+        <programlisting role="example"><![CDATA[
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Пример Matplot1()","","")
+
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
+
+            subplot(2,2,3)
+            title("Несколько меньшие графики:", "fontsize",3)
+
+            subplot(2,4,5)
+            polarplot()
+
+            subplot(2,4,6)
+            param3d()
+            xtitle("","","","")
+ ]]></programlisting>
+        <scilab:image localized="true">
+            clf
+            subplot(1,2,2)
+            Matplot1()
+            xtitle("Примеры Matplot1()","","")
+
+            subplot(2,2,1)
+            histplot
+            delete(findobj("type","Legend"))
+
+            subplot(2,2,3)
+            title("Несколько меньшие графики:", "fontsize",3)
+
+            subplot(2,4,5)
+            polarplot()
+
+            subplot(2,4,6)
+            param3d()
+            xtitle("","","","")
+            gcf().axes_size = [670 400];
+        </scilab:image>
+    </refsection>
+    <refsection role="see also">
+        <title>Смотрите также</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="xsetech">xsetech</link>
+            </member>
+            <member>
+                <link linkend="newaxes">newaxes</link>
+            </member>
+            <member>
+                <link linkend="axes_properties">axes_properties</link>
+            </member>
+            <member>
+                <link linkend="plotframe">plotframe</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>
index 8b93df1..2185c02 100644 (file)
@@ -1026,6 +1026,8 @@ splin_2.png=446983411e4aa2a48c9aa96edef44404
 springcolormap_1.png=b6f8f97a269786a9d53e4fe31b097861\r
 stringbox_1.png=6546ab6a9d8edbd09c41eebc2b77c67b\r
 subplot_1.png=4178b6def9655a23b78ab238c2380d5f\r
+subplot_2.png=ee882cd4d9decc7830268a7789c2d708\r
+subplot_ru_RU_2.png=809bf9fc254afe14e891c56e13606d1f\r
 summercolormap_1.png=b6e693f0c3ddcfcb7271926e20457ebd\r
 surf_1.png=99bdb76f83b1c67ab63193e5a28135a4\r
 surf_10.png=c18da91e3465c1e46c633a9a5b1c86b8\r
diff --git a/scilab/modules/helptools/images/subplot_2.png b/scilab/modules/helptools/images/subplot_2.png
new file mode 100644 (file)
index 0000000..893e98d
Binary files /dev/null and b/scilab/modules/helptools/images/subplot_2.png differ
diff --git a/scilab/modules/helptools/images/subplot_ru_RU_2.png b/scilab/modules/helptools/images/subplot_ru_RU_2.png
new file mode 100644 (file)
index 0000000..5428042
Binary files /dev/null and b/scilab/modules/helptools/images/subplot_ru_RU_2.png differ