X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=9e762cb367b0e51c5375aa4d822edcd3fd26f0c8;hb=b430c32d29caa72a7ae3f679f1f62066c1ebfa95;hp=a27dda61d1b0a050d80d78fa0b7325472ac2d2dd;hpb=9505acaaf90190158f6b66b59da13db1454cddc4;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index a27dda61d1..9e762cb367 100644 --- a/lily/font-metric.cc +++ b/lily/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 @@ -48,8 +48,8 @@ Font_metric::find_by_name (string s) const if (idx >= 0) { expr = scm_list_3 (ly_symbol2scm ("named-glyph"), - self_scm (), - ly_string2scm (s)); + self_scm (), + ly_string2scm (s)); b = get_indexed_char_dimensions (idx); } @@ -79,7 +79,7 @@ Font_metric::count () const } Box -Font_metric::get_indexed_char_dimensions (size_t k) const +Font_metric::get_indexed_char_dimensions (size_t) const { return Box (Interval (0, 0), Interval (0, 0)); } @@ -87,7 +87,7 @@ Font_metric::get_indexed_char_dimensions (size_t k) const size_t Font_metric::name_to_index (string) const { - return (size_t)-1; + return (size_t) - 1; } Offset @@ -138,16 +138,10 @@ Font_metric::font_name () const return s; } -size_t -Font_metric::index_to_ascii (size_t i) const -{ - return i; -} - size_t Font_metric::index_to_charcode (size_t i) const { - return index_to_ascii (i); + return i; } Offset @@ -163,11 +157,11 @@ Font_metric::sub_fonts () const } Stencil -Font_metric::text_stencil (Output_def* state, +Font_metric::text_stencil (Output_def *state, string, bool) const { (void) state; - + programming_error ("Cannot get a text stencil from this font"); return Stencil (Box (), SCM_EOL); }