From 2a9672eb13f361d6936b09426193b3889571c8eb Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Date: Thu, 6 Dec 2012 17:58:59 +0100
Subject: [PATCH] * getmark() tagged as obsolete. Will be removed for Scilab
 5.5.0.   Use ged()

Change-Id: Ia560e05d0629c97ad52def981d686794a3c24946
---
 scilab/CHANGES_5.4.X                               |    3 +++
 .../graphics/help/en_US/style/getlinestyle.xml     |   10 ++++------
 .../modules/graphics/help/en_US/style/getmark.xml  |   17 +++++++++++++----
 scilab/modules/graphics/macros/getmark.sci         |    5 +++++
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 896c745..d0674c7 100644
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -55,6 +55,9 @@ Obsolete functions
 * getlinestyle() tagged as obsolete. Will be removed for Scilab 5.5.0.
   Use ged() instead.
 
+* getmark() tagged as obsolete. Will be removed for Scilab 5.5.0.
+  Use ged() instead.
+
 
 Xcos
 =====
diff --git a/scilab/modules/graphics/help/en_US/style/getlinestyle.xml b/scilab/modules/graphics/help/en_US/style/getlinestyle.xml
index 5a27ab7..b894ade 100644
--- a/scilab/modules/graphics/help/en_US/style/getlinestyle.xml
+++ b/scilab/modules/graphics/help/en_US/style/getlinestyle.xml
@@ -39,10 +39,8 @@
     <refsection>
         <title>Description</title>
         <para>
-            This function designed to work with the <link linkend="xset">xset</link> function <emphasis role="bold">is also
-                obsolete
-            </emphasis>
-            .Use the property editor <link linkend="ged">ged</link> instead.
+            This function designed to work with the <link linkend="xset">xset</link> function <emphasis role="bold">is also obsolete</emphasis>.
+            Use the property editor <link linkend="ged">ged</link> instead.
         </para>
         <para>
             <literal>getlinestyle</literal> opens a graphic window to select a
@@ -63,8 +61,8 @@ e.children(1).line_style = getlinestyle();
         <revhistory>
             <revision>
                 <revnumber>5.4.1</revnumber>
-                <revdescription>Function tagged obsolete. Will be removed in 5.5
-                    Please use <link linkend="ged">ged</link>.
+                <revdescription>
+                    Function tagged obsolete. Will be removed in 5.5.0. Please use <link linkend="ged">ged</link> instead.
                 </revdescription>
             </revision>
         </revhistory>
diff --git a/scilab/modules/graphics/help/en_US/style/getmark.xml b/scilab/modules/graphics/help/en_US/style/getmark.xml
index 77fd9bb..e74797a 100644
--- a/scilab/modules/graphics/help/en_US/style/getmark.xml
+++ b/scilab/modules/graphics/help/en_US/style/getmark.xml
@@ -43,10 +43,8 @@
     <refsection>
         <title>Description</title>
         <para>
-            This function designed to work with the <link linkend="xset">xset</link> function <emphasis role="bold">is also
-                obsolete
-            </emphasis>
-            .Use the property editor <link linkend="ged">ged</link> instead.
+            This function designed to work with the <link linkend="xset">xset</link> function <emphasis role="bold">is also obsolete </emphasis>.
+            Use the property editor <link linkend="ged">ged</link> instead.
         </para>
         <para>
             <literal>getmark</literal> opens a graphic window to select a mark
@@ -66,6 +64,17 @@ e=gce(); // store the Compound containing the plot
 e.children(1).mark_style = mark;
  ]]></programlisting>
     </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.4.1</revnumber>
+                <revdescription>
+                    Function tagged obsolete. Will be removed in 5.5.0. Please use <link linkend="ged">ged</link> instead.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
     <refsection role="see also">
         <title>See Also</title>
         <simplelist type="inline">
diff --git a/scilab/modules/graphics/macros/getmark.sci b/scilab/modules/graphics/macros/getmark.sci
index 17dcead..39a049c 100644
--- a/scilab/modules/graphics/macros/getmark.sci
+++ b/scilab/modules/graphics/macros/getmark.sci
@@ -13,9 +13,14 @@ function [k1,k2]=getmark()
 //and mark size. 
   [lhs,rhs]=argn(0)
   k1=[];k2=[];
+
+  warnobsolete('ged', '5.5.0');
+
   win=max(winsid()+1);
   f=scf(win)
 
+
+
   nbMarks = 14;
   nbSizes = 6;
   
-- 
1.7.9.5