From a5b27ce7444ce8356aa9df098c7dc2dadb7cd890 Mon Sep 17 00:00:00 2001
From: Samuel GOUGEON <sgougeon@free.fr>
Date: Thu, 29 Aug 2019 23:12:00 +0200
Subject: [PATCH] * Bug 16177 fixed [doc]: 1st example was KO in uicontrol
 page

  http://bugzilla.scilab.org/16177

Change-Id: I5454a67f7c675713287407098429ba3920fb54e2
---
 scilab/CHANGES.md                           |    2 +
 scilab/modules/gui/help/en_US/uicontrol.xml |   66 ++++++++++++++++++---------
 scilab/modules/gui/help/ja_JP/uicontrol.xml |   23 ++++++----
 3 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index b91f9e6..2c7ca15 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -272,6 +272,7 @@ Bug Fixes
 * [#16160](http://bugzilla.scilab.org/show_bug.cgi?id=16160): `ppol` changed values of third input variable.
 * [#16164](http://bugzilla.scilab.org/show_bug.cgi?id=16164): Help pages in elementary_functions/signal_processing were mislocated.
 * [#16174](http://bugzilla.scilab.org/show_bug.cgi?id=16174): `libraryinfo` yielded 0x0 matrix of strings for libs without macro
+* [#16177](http://bugzilla.scilab.org/show_bug.cgi?id=16177): In the uicontrol help page, the first example was bugged.
 * [#16178](http://bugzilla.scilab.org/show_bug.cgi?id=16178): `sci2exp` yielded an error for any input macro without output argument.
 * [#16197](http://bugzilla.scilab.org/show_bug.cgi?id=16197): result of extraction was not decomplexified when applicable.
 * [#16200](http://bugzilla.scilab.org/show_bug.cgi?id=16200): Concatenation of transposed cells crashed Scilab.
@@ -294,3 +295,4 @@ Bug Fixes
 * [#16293](http://bugzilla.scilab.org/show_bug.cgi?id=16293): Some demos run in step-by-step console mode(4) did not focus user's attention to the console to proceed.
 * [#16299](http://bugzilla.scilab.org/show_bug.cgi?id=16299): After `graypolarplot()`, `colorbar()` displayed an empty ungraduated color bar.
 * [#16303](http://bugzilla.scilab.org/show_bug.cgi?id=16303): log10(x) had wrong dimensions when x is an hypermatrix.
+
diff --git a/scilab/modules/gui/help/en_US/uicontrol.xml b/scilab/modules/gui/help/en_US/uicontrol.xml
index 2a98a4f..eec449c 100644
--- a/scilab/modules/gui/help/en_US/uicontrol.xml
+++ b/scilab/modules/gui/help/en_US/uicontrol.xml
@@ -1,5 +1,8 @@
 <?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:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="uicontrol" 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:ns4="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="uicontrol" xml:lang="en">
     <refnamediv>
         <refname>uicontrol</refname>
         <refpurpose>create a Graphic User Interface object</refpurpose>
@@ -50,16 +53,21 @@
             specified by uich.
         </para>
         <para>
-            All available properties and their description are given in the <link linkend="uicontrol_properties">uicontrol properties</link> help page.
+            All available properties and their description are given in the
+            <link linkend="uicontrol_properties">uicontrol properties</link> help page.
         </para>
         <para>
-            Uicontrols rendering and properties display can be customized using <link linkend="console_properties">Console properties</link>.
+            Uicontrols rendering and properties display can be customized using
+            <link linkend="console_properties">Console properties</link>.
         </para>
     </refsection>
     <refsection>
         <title>Available styles</title>
         <para>
-            The available styles are listed below. The <literal>style</literal> of an <literal>uicontrol</literal> must be set at creation using the <literal>"Style"</literal> property and can not be changed once the <literal>uicontrol</literal> is created.
+            The available styles are listed below. The <literal>style</literal> of an
+            <literal>uicontrol</literal> must be set at creation using the
+            <literal>"Style"</literal> property and can not be changed once the
+            <literal>uicontrol</literal> is created.
         </para>
         <itemizedlist>
             <listitem>
@@ -78,11 +86,14 @@
             </listitem>
             <listitem>
                 <para>
-                    Layer: a container for <literal>frame</literal> style uicontrols enabling to switch between them programmatically using the <literal>value</literal> property.
+                    Layer: a container for <literal>frame</literal> style uicontrols enabling to
+                    switch between them programmatically using the <literal>value</literal> property.
                 </para>
             </listitem>
             <listitem>
-                <para>Listbox: a control representing a list of items that can be scrolled. The items can be selected with the mouse.</para>
+                <para>Listbox: a control representing a list of items that can be scrolled.
+                    The items can be selected with the mouse.
+                </para>
             </listitem>
             <listitem>
                 <para>Popupmenu: a button which make a menu appear when clicked.</para>
@@ -92,21 +103,32 @@
                 </para>
             </listitem>
             <listitem>
-                <para>Radiobutton: a button with two states. RadioButtons are intended to be mutually exclusive.</para>
+                <para>
+                    Radiobutton: a button with two states. RadioButtons are intended to be mutually
+                    exclusive.
+                </para>
                 <para>
                     Your code must implement mutually exclusive behavior if you do not use groups
-                    (See <literal>GroupName</literal> property in <link linkend="uicontrol_properties">uicontrol properties</link>).
+                    (See <literal>GroupName</literal> property in
+                    <link linkend="uicontrol_properties">uicontrol properties</link>).
                 </para>
             </listitem>
             <listitem>
-                <para>Slider: a scale control, that is a slider used to set values between in range with the mouse.</para>
+                <para>
+                    Slider: a scale control, that is a slider used to set a value in a given
+                    interval, with the mouse.
+                </para>
             </listitem>
             <listitem>
-                <para>Spinner: a component which enables the user to select/edit a value between bounds with a fixed step.</para>
+                <para>
+                    Spinner: a component which enables the user to select/edit a value between
+                    bounds with a fixed step.
+                </para>
             </listitem>
             <listitem>
                 <para>
-                    Tab: a container for <literal>frame</literal> style uicontrols enabling to switch between them by clicking on a tab with a given title and/or icon.
+                    Tab: a container for <literal>frame</literal> style uicontrols enabling to
+                    switch between them by clicking on a tab with a given title and/or icon.
                 </para>
                 <para>The font related properties set on the frame will be used for the tab label.</para>
             </listitem>
@@ -121,17 +143,17 @@
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-f=figure();
-// create a figure
-h=uicontrol(f,'style','listbox', ...
- 'position', [10 10 150 160]);
-// create a listbox
-set(h, 'string', "item 1|item 2|item3");
-// fill the list
-set(h, 'value', [1 3]);
-// select item 1 and 3 in the list
-close(f);
-// close the figure
+// Create a figure:
+f = scf();
+
+// Create a listbox:
+h = uicontrol(f,'style','listbox','position', [10 10 150 160]);
+
+// Set labels
+h.string = "item 1|item 2|item 3";
+
+// Set (max-min)>1 to allow multiple selection, and select items 1 and 3
+set(h, "min",0, "max",2, "value", [1 3]);
  ]]></programlisting>
         <para>uicontrol function can be overloaded</para>
         <programlisting role="example"><![CDATA[
diff --git a/scilab/modules/gui/help/ja_JP/uicontrol.xml b/scilab/modules/gui/help/ja_JP/uicontrol.xml
index 410e606..6a4b256 100644
--- a/scilab/modules/gui/help/ja_JP/uicontrol.xml
+++ b/scilab/modules/gui/help/ja_JP/uicontrol.xml
@@ -1,5 +1,8 @@
 <?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:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="uicontrol" 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:ns4="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="uicontrol" xml:lang="ja">
     <refnamediv>
         <refname>uicontrol</refname>
         <refpurpose>グラフィックユーザーインターフェイスオブジェクトを作成
@@ -155,17 +158,17 @@
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-f=figure();
 // 図を作成
-h=uicontrol(f,'style','listbox', ...
- 'position', [10 10 150 160]);
+f = scf();
+
 // リストボックスを作成
-set(h, 'string', "item 1|item 2|item3");
-// リストを埋める
-set(h, 'value', [1 3]);
-// リストで要素1と3を選択
-close(f);
-// close the figure
+h = uicontrol(f,'style','listbox','position', [10 10 150 160]);
+
+// Set labels
+h.string = "item 1|item 2|item 3";
+
+// Set (max-min)>1 to allow multiple selection, and select items 1 and 3
+set(h, "min",0, "max",2, "value", [1 3]);
  ]]></programlisting>
         <para>uicontrol関数はオーバーロードできます</para>
         <programlisting role="example"><![CDATA[
-- 
1.7.9.5