Mercurial > octave-nkf

changeset 11549:beb4f0f27a32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use {} as the default font for the gnuplot backend
author David Bateman <dbateman@free.fr>
date Sun, 16 Jan 2011 22:46:19 +0100
parents 50a7935f2512
children a9be431c1595
files scripts/ChangeLog scripts/plot/__go_draw_axes__.m
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Sun Jan 16 08:58:46 2011 -0600
+++ b/scripts/ChangeLog	Sun Jan 16 22:46:19 2011 +0100
@@ -1,6 +1,10 @@
+2011-01-16  David Bateman  <dbateman@free.fr>
+
+	* plot/__go_draw_axes__.m: Use "{}" as the default font.
+
 2011-01-15  Rik  <octave@nomad.inbox5.com>
 
-	* scripts/help/doc.m, scripts/help/which.m, 
+	* scripts/help/doc.m, scripts/help/which.m,
 	scripts/miscellaneous/comma.m, scripts/miscellaneous/ls.m,
 	scripts/miscellaneous/paren.m, scripts/miscellaneous/semicolon.m,
 	scripts/pkg/pkg.m: Eliminate @deffn macros.
--- a/scripts/plot/__go_draw_axes__.m	Sun Jan 16 08:58:46 2011 -0600
+++ b/scripts/plot/__go_draw_axes__.m	Sun Jan 16 22:46:19 2011 +0100
@@ -1472,7 +1472,8 @@
           pos = "";
       endswitch
       if (__gnuplot_has_feature__ ("key_has_font_properties"))
-        fontspec = create_fontspec (hlgnd.fontname, hlgnd.fontsize, gnuplot_term);
+        [fontname, fontsize] = get_fontname_and_size (obj);
+        fontspec = create_fontspec (fontname, fontsize, gnuplot_term);
       else
         fontspec = "";
       endif
@@ -2082,8 +2083,8 @@
 endfunction
 
 function [f, s, fnt, it, bld] = get_fontname_and_size (t)
-  if (isempty (t.fontname))
-    fnt = "Helvetica";
+  if (isempty (t.fontname) || strcmp (t.fontname, "*"))
+    fnt = "{}";
   else
     fnt = t.fontname;
   endif