* 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.
// '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);
--- /dev/null
+// =============================================================================
+// 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);
--- /dev/null
+// =============================================================================
+// 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);
+