fix after renaming of createBorderFont, border 10/14010/4
Antoine ELIAS [Thu, 13 Mar 2014 15:13:17 +0000 (16:13 +0100)]
Change-Id: I7639849642ae67f2b92b8cb891e6a846ddb62c47

scilab/CHANGES_5.5.X
scilab/modules/demo_tools/gui/demo_gui.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/en_US/figure_operations/figure_properties.xml
scilab/modules/graphics/src/c/getHandleProperty/get_border_property.c
scilab/modules/gui/demos/cb_uicontrol_plot3d.dem.sci
scilab/modules/gui/macros/createBorder.sci
scilab/modules/gui/tests/unit_tests/border.dia.ref [moved from scilab/modules/gui/tests/unit_tests/borders.dia.ref with 97% similarity]
scilab/modules/gui/tests/unit_tests/border.tst [moved from scilab/modules/gui/tests/unit_tests/borders.tst with 97% similarity]
scilab/modules/windows_tools/help/en_US/winqueryreg.xml
scilab/modules/windows_tools/help/fr_FR/winqueryreg.xml

index 87f4a76..568224a 100644 (file)
@@ -18,7 +18,7 @@ GUI Refactoring and Improvements
             with a fixed step.
 
 * New uicontrols properties:
- - borders: Used to set some decoration properties on "frame" uicontrols.
+ - border: Used to set some decoration properties on "frame" uicontrols.
             These decorations can be created and initialized with the createBorder
             and the createBorderFont functions.
  - scrollable: Used to add scrolling capabilities on "frame" uicontrols.
index fcf555f..dedfc1a 100644 (file)
@@ -2,63 +2,63 @@
 <scilabgui usedeprecatedskin="off" version="1.0">
     <figure axes_size="250,526" default_axes="off" dockable="off" figure_id="100000" figure_name="" figure_size="266,565" icon="applications-system" infobar_visible="off" layout="1" menubar="0" menubar_visible="off" resizefcn="resize_demo_gui" tag="scilab_demo_fig" toolbar="0" toolbar_visible="off" visible="off">
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="10,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_10" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_10" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="9,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_9" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_9" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="8,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_8" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_8" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="7,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_7" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_7" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="6,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_6" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_6" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="5,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_5" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_5" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="4,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_4" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_4" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="3,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_3" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_3" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="2,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_2" visible="off">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <listbox callback="script_path = demo_gui_update();if ~isempty(script_path) then exec(script_path, -1);end;clear script_path;" callback_type="0" fontsize="12.0" gridbagfill="3" gridbaggrid="1,1,1,4" gridbagweight="1.0,1.0" listboxtop="1" tag="listbox_2" value="3.0"/>
         </frame>
         <frame backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="1,1,1,1" gridbagpreferredsize="0,0" gridbagweight="1.0,1.0" layout="1" tag="frame_1">
-            <borders color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
+            <border color="black" fontangle="normal" fontname="" fontsize="12" fontweight="bold" justification="1" style="titled" title="">
                 <title style="empty"/>
-            </borders>
+            </border>
             <image backgroundcolor="1.0,1.0,1.0" gridbagfill="3" gridbaggrid="1,5,1,1" gridbagweight="1.0,0.1" horizontalalignment="center" tag="scilab_logo">
                 <string cols="1" property="string" rows="1">
                     <stringitem value="SCI/modules/demo_tools/images/logo_scilab.png"/>
index c27a99f..e0a44f8 100644 (file)
@@ -1039,11 +1039,11 @@ a.ticks_st=[1 1;0 m(2)];
             <revision>
                 <revnumber>5.5.0</revnumber>
                 <revremark>
-                    <itemizelist>
+                    <itemizedlist>
                         <listitem>line_style values 9 and 10 can be used to have respectively longblank dot and bigblank dot styles.</listitem>
                         <listitem>auto_margins property added to allow automatic computation of the margins.</listitem>
                         <listitem>ticks_format and ticks_st properties added to improve ticks labels display.</listitem>
-                    </itemizelist>
+                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
index 1d44019..c57fcd5 100644 (file)
                             <term>resize: </term>
                             <listitem>
                                 <para>
-                                    This property locks the figure size. Its value can be <literal>"on"</literal> (default value) or <literal>"off"</literal> (the figure can not be resized neither through <link linkend="set">set</link> nor mouse events).
+                                    This property locks the figure size. Its value can be <literal>"on"</literal> (default value) or <literal>"off"</literal> (the figure can not be resized by mouse events).
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>layout: </term>
                             <listitem>
                                 <para>
-                                    This property sets the layout used to dispose the figure children. See <link linked="layouts">layouts</link> page for more information about available layouts.
+                                    This property sets the layout used to dispose the figure children. See <link linkend="layout">layout</link> page for more information about available layouts.
                                 </para>
                             </listitem>
                         </varlistentry>
                             <term>layout_options: </term>
                             <listitem>
                                 <para>
-                                    This property sets the options of the layout used to dispose the figure children. See <link linked="layout">layouts</link> page for more information about available options.
+                                    This property sets the options of the layout used to dispose the figure children. See <link linkend="layout">layout</link> page for more information about available options.
                                 </para>
                             </listitem>
                         </varlistentry>
@@ -467,7 +467,6 @@ plot3d(t,t,sin(t)'*cos(t),35,45,'X@Y@Z',[15,2,4]);
             <member>
                 <link linkend="axes_properties">axes_properties</link>
             </member>
-            <member/>
             <member>
                 <link linkend="hotcolormap">hotcolormap</link>
             </member>
@@ -481,18 +480,22 @@ plot3d(t,t,sin(t)'*cos(t),35,45,'X@Y@Z',[15,2,4]);
         <revhistory>
             <revision>
                 <revnumber>5.5.0</revnumber>
-                <revremark>"visible" property meaning changed (uicontrols managed and the whole figure can be made invisible in some cases.</revremark>
-                <revremark>"icon" property added to allow figure icon change.</revremark>
-                <revremark>"menubar_visible" property added.</revremark>
-                <revremark>"toolbar_visible" property added.</revremark>
-                <revremark>"infobar_visible" property added.</revremark>
-                <revremark>"resize" property added.</revremark>
-                <revremark>"dockable" property added.</revremark>
-                <revremark>"menubar" property added.</revremark>
-                <revremark>"toolbar" property added.</revremark>
-                <revremark>"default_axes" property added.</revremark>
-                <revremark>"layout" property added.</revremark>
-                <revremark>"layout_options" property added.</revremark>
+                <revremark>
+                <itemizedlist>
+                    <listitem>"visible" property meaning changed (uicontrols managed and the whole figure can be made invisible in some cases.</listitem>
+                    <listitem>"icon" property added to allow figure icon change.</listitem>
+                    <listitem>"menubar_visible" property added.</listitem>
+                    <listitem>"toolbar_visible" property added.</listitem>
+                    <listitem>"infobar_visible" property added.</listitem>
+                    <listitem>"resize" property added.</listitem>
+                    <listitem>"dockable" property added.</listitem>
+                    <listitem>"menubar" property added.</listitem>
+                    <listitem>"toolbar" property added.</listitem>
+                    <listitem>"default_axes" property added.</listitem>
+                    <listitem>"layout" property added.</listitem>
+                    <listitem>"layout_options" property added.</listitem>
+                </itemizedlist>
+                </revremark>
             </revision>
             <revision>
                 <revnumber>5.4.0</revnumber>
index 61bc68f..b0ddc0c 100644 (file)
@@ -569,7 +569,7 @@ int getTitledBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iOb
     {
         //create a Font Border
         int* piFont = NULL;
-        char* pstFontBorder[] = {"FontBorder", "name", "size", "angle", "weight"};
+        char* pstFontBorder[] = {"BorderFont", "name", "size", "angle", "weight"};
 
         sciErr = createTListInList(_pvCtx, _iVar, piAddrList, 6, 5, &piFont);
         if (sciErr.iErr)
index 420bd4c..b3f02e7 100644 (file)
@@ -43,7 +43,7 @@ function uicontrol_plot3d()
     frame_left = uicontrol(demo_plot3d, ...
         "style", "frame", ...
         "constraints", createConstraints("gridbag", [1, 1, 1, 1], [0.4, 1], "both", "left", [0, 0], [0, 0]), ...
-        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Control Panel"), "center", "below_top", createFontBorder("", 16, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Control Panel"), "center", "below_top", createBorderFont("", 16, "normal"), "black"), ...
         "backgroundcolor", [1 1 1], ...
         "layout", "gridbag");
 
@@ -58,7 +58,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 2, 1, 1], [0, 0], "both", "center"), ...
-        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Rotation angle"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Rotation angle"), "center", "top", createBorderFont("", 11, "normal"), "black"), ...
         "layout", "border");
 
     uicontrol(frame_angle, ...
@@ -81,7 +81,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 4, 1, 1], [0, 0], "both", "center"), ...
-        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Colormap"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Colormap"), "center", "top", createBorderFont("", 11, "normal"), "black"), ...
         "layout_options", createLayoutOptions("grid", [3, 1]));
 
     frame_colormap.layout = "grid";
@@ -123,7 +123,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 6, 1, 1], [0, 0], "both", "center"), ...
-        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Background Color"), "center", "top", createFontBorder("", 11, "normal"), "black"), ..
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Background Color"), "center", "top", createBorderFont("", 11, "normal"), "black"), ..
         "layout", "border");
 
     uicontrol(frame_background, ...
@@ -146,7 +146,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 8, 1, 1], [1, 1], "both", "center"), ...
-        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Show / Hide"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Show / Hide"), "center", "top", createBorderFont("", 11, "normal"), "black"), ...
         "layout_options", createLayoutOptions("grid", [4, 1]));
 
     frame_style.layout = "grid";
@@ -190,7 +190,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 10, 1, 1], [1, 0], "both", "center"), ...
-        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Title"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Title"), "center", "top", createBorderFont("", 11, "normal"), "black"), ...
         "layout", "border");
 
     uicontrol(frame_style, ...
index 9478d7b..bf54822 100644 (file)
@@ -245,7 +245,7 @@ function ret = createBorder(constType, varargin)
 
         //font
         arg5 = varargin(5);
-        if typeof(arg5) <> "FontBorder" then
+        if typeof(arg5) <> "BorderFont" then
             error(999, msprintf(_("%s: Wrong type for input argument #%d: A Font Border expected.\n"), "createBorder", 6));
         end
 
@@ -6,7 +6,7 @@
 // =============================================================================
 // <-- TEST WITH GRAPHIC -->
 l = list();
-//borders
+//border
 //none
 //l($+1) = createBorder("none");
 //empty
@@ -52,5 +52,5 @@ f = figure( ...
     "layout_options", createLayoutOptions("grid", [4,0], [1 1]));
 for i = 1:size(l)
     u = uicontrol(f, "style", "frame", "border", l(i));
-    assert_checkequal(u.borders, l(i));
+    assert_checkequal(u.border, l(i));
 end
@@ -9,7 +9,7 @@
 
 
 l = list();
-//borders
+//border
 //none
 //l($+1) = createBorder("none");
 //empty
@@ -57,5 +57,5 @@ f = figure( ...
     "layout_options", createLayoutOptions("grid", [4,0], [1 1]));
 for i = 1:size(l)
     u = uicontrol(f, "style", "frame", "border", l(i));
-    assert_checkequal(u.borders, l(i));
+    assert_checkequal(u.border, l(i));
 end
index 1f911f1..f0c5d61 100644 (file)
@@ -1,5 +1,5 @@
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Allan CORNET
  * 
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
-        <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="winqueryreg">
-            <refnamediv>
-                <refname>winqueryreg</refname>
-                <refpurpose>Get item from Microsoft Windows
-                    registry (Windows only)
-                </refpurpose>
-            </refnamediv>
-            <refsynopsisdiv>
-                <title>Calling Sequence</title>
-                <synopsis>
-                    value = winqueryreg('name', 'rootkey','subkey')
-                    value = winqueryreg('key', 'rootkey','subkey')
-                    value = winqueryreg('rootkey', 'subkey','valname')
-                    value = winqueryreg('rootkey','subkey')
-                </synopsis>
-            </refsynopsisdiv>
-            <refsection>
-                <title>Description</title>
-                <para>
-                    value = winqueryreg('name', 'rootkey', 'subkey') returns the values names
-                    in <literal>rootkey\subkey</literal> in a matrix of strings. The first argument
-                    is the literal quoted string, 'name'.
-                </para>
-                <para>If the data retrieved from the registry is a string, winqueryreg
-                    returns a string. If the data is a 32-bit integer, winqueryreg returns
-                    the data as an integer (int32).
-                </para>
-                <para>
-                    value = winqueryreg('key', 'rootkey', 'subkey') returns the keys names
-                    in <literal>rootkey\subkey</literal> in a matrix of strings. The first argument
-                    is the literal quoted string, 'key'.
-                </para>
-                <para>value = winqueryreg('rootkey', 'subkey', 'valname') returns the data
-                    for value valname in <literal>rootkey\subkey</literal>.
-                </para>
-                <para>value = winqueryreg('rootkey', 'subkey') returns a data in
-                    <literal>rootkey\subkey</literal> that has no value name property.
-                </para>
-                <para>
-                    <literal>Note</literal>The literal name argument, key argument and the rootkey argument
-                    are case-sensitive. The subkey and valname arguments are not.
-                </para>
-                <para>supported root keys are: 'HKEY_CLASSES_ROOT', 'HKEY_CURRENT_USER', 'HKEY_LOCAL_MACHINE', 'HKEY_USERS', 'HKEY_DYN_DATA' and 'HKEY_CURRENT_CONFIG'.</para>
-                <para>and shortcut names: 'HKCR', 'HKCU', 'HKLM', 'HKU', 'HKDD' and 'HKCC'.</para>
-            </refsection>
-            <refsection>
-                <title>Examples</title>
-                <programlisting role="example">
-                    <![CDATA[ 
+<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="winqueryreg">
+    <refnamediv>
+        <refname>winqueryreg</refname>
+        <refpurpose>Get item from Microsoft Windows
+            registry (Windows only)
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            value = winqueryreg('name', 'rootkey','subkey')
+            value = winqueryreg('key', 'rootkey','subkey')
+            value = winqueryreg('rootkey', 'subkey','valname')
+            value = winqueryreg('rootkey','subkey')
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Description</title>
+        <para>
+            value = winqueryreg('name', 'rootkey', 'subkey') returns the values names
+            in <literal>rootkey\subkey</literal> in a matrix of strings. The first argument
+            is the literal quoted string, 'name'.
+        </para>
+        <para>If the data retrieved from the registry is a string, winqueryreg
+            returns a string. If the data is a 32-bit integer, winqueryreg returns
+            the data as an integer (int32).
+        </para>
+        <para>
+            value = winqueryreg('key', 'rootkey', 'subkey') returns the keys names
+            in <literal>rootkey\subkey</literal> in a matrix of strings. The first argument
+            is the literal quoted string, 'key'.
+        </para>
+        <para>value = winqueryreg('rootkey', 'subkey', 'valname') returns the data
+            for value valname in <literal>rootkey\subkey</literal>.
+        </para>
+        <para>value = winqueryreg('rootkey', 'subkey') returns a data in
+            <literal>rootkey\subkey</literal> that has no value name property.
+        </para>
+        <para>
+            <literal>Note</literal>The literal name argument, key argument and the rootkey argument
+            are case-sensitive. The subkey and valname arguments are not.
+        </para>
+        <para>supported root keys are: 'HKEY_CLASSES_ROOT', 'HKEY_CURRENT_USER', 'HKEY_LOCAL_MACHINE', 'HKEY_USERS', 'HKEY_DYN_DATA' and 'HKEY_CURRENT_CONFIG'.</para>
+        <para>and shortcut names: 'HKCR', 'HKCU', 'HKLM', 'HKU', 'HKDD' and 'HKCC'.</para>
+    </refsection>
+    <refsection>
+        <title>Examples</title>
+        <programlisting role="example">
+            <![CDATA[ 
 if getos() == 'Windows' then
     winqueryreg 'HKEY_LOCAL_MACHINE' 'HARDWARE\DESCRIPTION\System\CentralProcessor\0\' 'ProcessorNameString'
     
@@ -75,24 +75,24 @@ if getos() == 'Windows' then
     winqueryreg('key' ,'HKLM', 'Software\Microsoft\.NETFramework')
 end
  ]]>
-                </programlisting>
-            </refsection>
-            <refsection>
-                <title>History</title>
-                <revhistory>
-                    <revision>
-                        <revnumber>5.4.0</revnumber>
-                        <revremark>This function also manages 'HKEY_CURRENT_CONFIG' key.</revremark>
-                    </revision>
-                    <revision>
-                        <revnumber>5.4.1</revnumber>
-                        <revremark>
-                            <itemizedlist>
-                                <listitem>Manage shorcut root names.</listitem>
-                                <listitem>Can retrieve key list names.</listitem>
-                            </itemizedlist>
-                        </revremark>
-                    </revision>
-                </revhistory>
-            </refsection>
-        </refentry>
+        </programlisting>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.4.0</revnumber>
+                <revremark>This function also manages 'HKEY_CURRENT_CONFIG' key.</revremark>
+            </revision>
+            <revision>
+                <revnumber>5.4.1</revnumber>
+                <revremark>
+                    <itemizedlist>
+                        <listitem>Manage shorcut root names.</listitem>
+                        <listitem>Can retrieve key list names.</listitem>
+                    </itemizedlist>
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 9fa8c95..029512e 100644 (file)
@@ -1,53 +1,53 @@
-        <?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="winqueryreg">
-            <refnamediv>
-                <refname>winqueryreg</refname>
-                <refpurpose>Obtenir une clef de la base des
-                    registres de Microsoft Windows
-                </refpurpose>
-            </refnamediv>
-            <refsynopsisdiv>
-                <title>Séquence d'appel</title>
-                <synopsis>
-                    value = winqueryreg('name', 'rootkey', 'subkey')
-                    value = winqueryreg('key', 'rootkey', 'subkey')
-                    value = winqueryreg('rootkey', 'subkey', 'valname')
-                    value = winqueryreg('rootkey', 'subkey')
-                </synopsis>
-            </refsynopsisdiv>
-            <refsection>
-                <title>Description</title>
-                <para>value = winqueryreg('name', 'rootkey', 'subkey') retourne les clefs
-                    contenues dans rootkey\subkey dans une matrice de chaines de caracteres.
-                    Le premier argument doit etre la chaine de caracteres, 'name'.
-                </para>
-                <para>Si la valeur contenue dans la base des registres est une chaine de
-                    caracteres, winqueryreg retourne une chaine de caracteres. Si la valeur
-                    est un entier sur 32 bits, winqueryreg retourne la valeur comme un entier
-                    (int32).
-                </para>
-                <para>
-                    value = winqueryreg('key', 'rootkey', 'subkey') retourne les sous clés
-                    contenues dans rootkey\subkey dans une matrice de chaines de caracteres.
-                    Le premier argument doit etre la chaine de caracteres, 'key'.
-                </para>
-                <para>value = winqueryreg('rootkey', 'subkey', 'valname') retourne la valeur
-                    pour la clef valname dans rootkey\subkey.
-                </para>
-                <para>value = winqueryreg('rootkey', 'subkey') retourne la valeur "par
-                    défaut" de la clef rootkey\subkey.
-                </para>
-                <para>
-                    <literal>Note</literal>Les arguments 'name', 'key et 'rootkey' sont
-                    "case-sensitive". Les arguments 'subkey' et 'valname' ne le sont pas.
-                </para>
-                <para>Les clefs racine supportées sont: 'HKEY_CLASSES_ROOT', 'HKEY_CURRENT_USER', 'HKEY_LOCAL_MACHINE', 'HKEY_USERS', 'HKEY_DYN_DATA' and 'HKEY_CURRENT_CONFIG'.</para>
-                <para>Leurs raccourcis peuvent aussi être utilisé 'HKCR', 'HKCU', 'HKLM', 'HKU', 'HKDD' and 'HKCC'</para>
-            </refsection>
-            <refsection>
-                <title>Exemples</title>
-                <programlisting role="example">
-                    <![CDATA[
+<?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="winqueryreg">
+    <refnamediv>
+        <refname>winqueryreg</refname>
+        <refpurpose>Obtenir une clef de la base des
+            registres de Microsoft Windows
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Séquence d'appel</title>
+        <synopsis>
+            value = winqueryreg('name', 'rootkey', 'subkey')
+            value = winqueryreg('key', 'rootkey', 'subkey')
+            value = winqueryreg('rootkey', 'subkey', 'valname')
+            value = winqueryreg('rootkey', 'subkey')
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Description</title>
+        <para>value = winqueryreg('name', 'rootkey', 'subkey') retourne les clefs
+            contenues dans rootkey\subkey dans une matrice de chaines de caracteres.
+            Le premier argument doit etre la chaine de caracteres, 'name'.
+        </para>
+        <para>Si la valeur contenue dans la base des registres est une chaine de
+            caracteres, winqueryreg retourne une chaine de caracteres. Si la valeur
+            est un entier sur 32 bits, winqueryreg retourne la valeur comme un entier
+            (int32).
+        </para>
+        <para>
+            value = winqueryreg('key', 'rootkey', 'subkey') retourne les sous clés
+            contenues dans rootkey\subkey dans une matrice de chaines de caracteres.
+            Le premier argument doit etre la chaine de caracteres, 'key'.
+        </para>
+        <para>value = winqueryreg('rootkey', 'subkey', 'valname') retourne la valeur
+            pour la clef valname dans rootkey\subkey.
+        </para>
+        <para>value = winqueryreg('rootkey', 'subkey') retourne la valeur "par
+            défaut" de la clef rootkey\subkey.
+        </para>
+        <para>
+            <literal>Note</literal>Les arguments 'name', 'key et 'rootkey' sont
+            "case-sensitive". Les arguments 'subkey' et 'valname' ne le sont pas.
+        </para>
+        <para>Les clefs racine supportées sont: 'HKEY_CLASSES_ROOT', 'HKEY_CURRENT_USER', 'HKEY_LOCAL_MACHINE', 'HKEY_USERS', 'HKEY_DYN_DATA' and 'HKEY_CURRENT_CONFIG'.</para>
+        <para>Leurs raccourcis peuvent aussi être utilisé 'HKCR', 'HKCU', 'HKLM', 'HKU', 'HKDD' and 'HKCC'</para>
+    </refsection>
+    <refsection>
+        <title>Exemples</title>
+        <programlisting role="example">
+            <![CDATA[
 if getos() == 'Windows' then
     winqueryreg 'HKEY_LOCAL_MACHINE' 'HARDWARE\DESCRIPTION\System\CentralProcessor\0\' 'ProcessorNameString'
 
@@ -64,24 +64,24 @@ if getos() == 'Windows' then
     winqueryreg('key' ,'HKLM', 'Software\Microsoft\.NETFramework')
 end
  ]]>
-                </programlisting>
-            </refsection>
-            <refsection>
-                <title>History</title>
-                <revhistory>
-                    <revision>
-                        <revnumber>5.4.0</revnumber>
-                        <revremark>Cette fonction gére également la clé 'HKEY_CURRENT_CONFIG'.</revremark>
-                    </revision>
-                    <revision>
-                        <revnumber>5.4.1</revnumber>
-                        <revremark>
-                            <itemizedlist>
-                                <listitem>Accepte les raccourcis de clés racine.</listitem>
-                                <listitem>Peut renvoyer la liste des noms de clés.</listitem>
-                            </itemizedlist>
-                        </revremark>
-                    </revision>
-                </revhistory>
-            </refsection>
-        </refentry>
+        </programlisting>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.4.0</revnumber>
+                <revremark>Cette fonction gére également la clé 'HKEY_CURRENT_CONFIG'.</revremark>
+            </revision>
+            <revision>
+                <revnumber>5.4.1</revnumber>
+                <revremark>
+                    <itemizedlist>
+                        <listitem>Accepte les raccourcis de clés racine.</listitem>
+                        <listitem>Peut renvoyer la liste des noms de clés.</listitem>
+                    </itemizedlist>
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>