Bug 12481 fixed: xlabel could not be used with Scilab property names

Change-Id: Id899687176754352bc457ca369afcac92d5c8cb7

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 1bc71a3..7a04eb1 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -142,6 +142,8 @@ Scilab Bug Fixes
 
 * Bug #12334 fixed - Mark color in legend was invalid.
 
+* Bug #12481 fixed - xlabel could not be used with Scilab property names.
+
 * Bug #12485 fixed - xchange returned bad values with log scale.
 
 * Bug #12492 fixed - Exported EPS files were invalid when dash patterns were too long.

diff --git a/scilab/modules/graphics/macros/getTitleLabelPropertyNam.sci b/scilab/modules/graphics/macros/getTitleLabelPropertyNam.sci
index 6aef7ae..a6d3931 100644 (file)
--- a/scilab/modules/graphics/macros/getTitleLabelPropertyNam.sci
+++ b/scilab/modules/graphics/macros/getTitleLabelPropertyNam.sci
@@ -27,15 +27,23 @@ function [PName] = getTitleLabelPropertyNam(PropertyName,current_figure,cur_draw
     //         'visible' 'fill_mode' 'auto_position' 'auto_rotation']; // equivalent Table
 
     opt1=[];
-
     k=find(part(Table,1:length(str))==str);
 
+    if (isempty(k)) then
+        // Scilab names are allowed too...
+        k=find(part(TableEQ,1:length(str))==str);
+        if ~isempty(k) then
+            PName = TableEQ(k(1))
+            return;
+        end
+    end
+
     if (k == [])
         warning("Error in Property specification : bad argument specified");
         PName=[];
         ResetFigureDDM(current_figure, cur_draw_mode);
         return;
-    elseif ( size(k,"*") > 1)
+    elseif (size(k,"*") > 1)
         warning("Ambiguous text property");
         PName=[];
         ResetFigureDDM(current_figure, cur_draw_mode);

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_12481.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_12481.dia.ref
new file mode 100644 (file)
index 0000000..2948493
--- /dev/null
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_12481.dia.ref
@@ -0,0 +1,16 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH GRAPHIC -->
+// <-- Non-regression test for bug 12481 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/12481
+//
+// <-- Short Description -->
+// xlabel could not be used with Scilab property names
+//
+xlabel("foo","font_size", 3, "font_style", 9, "font_foreground", 5);

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_12481.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_12481.tst
new file mode 100644 (file)
index 0000000..ddb9bca
--- /dev/null
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_12481.tst
@@ -0,0 +1,18 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH GRAPHIC -->
+// <-- Non-regression test for bug 12481 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/12481
+//
+// <-- Short Description -->
+// xlabel could not be used with Scilab property names
+//
+
+xlabel("foo","font_size", 3, "font_style", 9, "font_foreground", 5);
+