X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmodified-font-metric.cc;h=eff730176b61e50a45fcadd028afdf74ddfd9e45;hb=e5380f29f23e204a603f8398368d2a7dc0260aa0;hp=5ad26a3548ddeecddaa645377a745ac15fa5e7fc;hpb=f1e6a812cca9ab3b58ce8f36acacde0c7f035448;p=lilypond.git diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 5ad26a3548..eff730176b 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2010 Han-Wen Nienhuys + Copyright (C) 1999--2011 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -54,17 +54,9 @@ Modified_font_metric::design_size () const } Box -Modified_font_metric::get_indexed_char (vsize i) const +Modified_font_metric::get_indexed_char_dimensions (vsize i) const { - Box b = orig_->get_indexed_char (i); - b.scale (magnification_); - return b; -} - -Box -Modified_font_metric::get_ascii_char (vsize i) const -{ - Box b = orig_->get_ascii_char (i); + Box b = orig_->get_indexed_char_dimensions (i); b.scale (magnification_); return b; } @@ -101,19 +93,13 @@ Modified_font_metric::index_to_charcode (vsize i) const return orig_->index_to_charcode (i); } -vsize -Modified_font_metric::index_to_ascii (vsize k) const -{ - return orig_->index_to_ascii (k); -} - void Modified_font_metric::derived_mark () const { } Stencil -Modified_font_metric::text_stencil (Output_def* state, +Modified_font_metric::text_stencil (Output_def *state, string text, bool feta) const { Box b;