Mercurial > hg > octave-nkf
changeset 11666:93d17b1e756f release-3-0-x
use Helvetica, not helvetica; don't downcase user-supplied font names
author | jwe |
---|---|
date | Mon, 14 Jan 2008 19:50:10 +0000 |
parents | 31443b3c5d3b |
children | bc4b8d973a3a |
files | scripts/ChangeLog scripts/plot/__go_draw_axes__.m |
diffstat | 2 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,10 @@ +2008-02-28 John W. Eaton <jwe@octave.org> + + * plot/__go_draw_axes__.m (get_fontname_and_size): Use strcmpi + instead of calling tolower on first arg. Default font name is + Helvetica, not helvetica. Don't downcase user-specified font name. + (__maybe_munge_text__): Fix typo. + 2008-02-25 Ryan Hinton <rwh4s@virginia.edu> * miscellaneous/unpack.m: Use "-f -" args for tar. @@ -96,13 +103,6 @@ * plot/__go_draw_axes__.m (__do_enhanced_option__): New subfunction. Use it to disable enhanced mode for individual labels and titles. -2008-01-14 John W. Eaton <jwe@octave.org> - - * plot/__go_draw_axes__.m (get_fontname_and_size): Use strcmpi - instead of calling tolower on first arg. Default font name is - Helvetica, not helvetica. Don't downcase user-specified font name. - (__maybe_munge_text__): Fix typo. - 2008-01-10 Ben Abbott <bpabbott@mac.com> * polynomial/mpoles.m: Avoid cases where poles could be assigned
--- a/scripts/plot/__go_draw_axes__.m +++ b/scripts/plot/__go_draw_axes__.m @@ -1632,17 +1632,17 @@ function [f, s, fnt, it, bld] = get_fontname_and_size (t) if (isempty (t.fontname)) - fnt = "helvetica"; + fnt = "Helvetica"; else - fnt = tolower (t.fontname); + fnt = t.fontname; endif f = fnt; it = false; bld = false; - if (! isempty (t.fontweight) && strcmp (tolower (t.fontweight), "bold")) + if (! isempty (t.fontweight) && strcmpi (t.fontweight, "bold")) if (! isempty(t.fontangle) - && (strcmp (tolower (t.fontangle), "italic") - || strcmp (tolower (t.fontangle), "oblique"))) + && (strcmpi (t.fontangle, "italic") + || strcmpi (t.fontangle, "oblique"))) f = strcat (f, "-bolditalic"); it = true; bld = true; @@ -1651,8 +1651,8 @@ bld = true; endif elseif (! isempty(t.fontangle) - && (strcmp (tolower (t.fontangle), "italic") - || strcmp (tolower (t.fontangle), "oblique"))) + && (strcmpi (t.fontangle, "italic") + || strcmpi (t.fontangle, "oblique"))) f = strcat (f, "-italic"); it = true; endif @@ -1670,7 +1670,7 @@ if (strcmp (fld, "string")) [f, s, fnt, it, bld] = get_fontname_and_size (obj); else - f = "Helvectica"; + f = "Helvetica"; s = 10; fnt = f; it = false;