X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ffont-metric.cc;h=0eb2b2903c738e1520ba6ed14ccd6b406e422dec;hb=c73b41b3e7be6d7280c6336cf03610cd7aed3000;hp=b2ff830696a315cd36e5bc1bd8fc25e6a7bcc998;hpb=9e996be61a0c43717b824a27ed92c9f2d986ec0e;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index b2ff830696..0eb2b2903c 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--2014 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,17 +79,11 @@ 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)); } -size_t -Font_metric::name_to_index (string) const -{ - return (size_t)-1; -} - Offset Font_metric::get_indexed_wxwy (size_t) const { @@ -145,7 +139,7 @@ Font_metric::index_to_charcode (size_t i) const } Offset -Font_metric::attachment_point (string) const +Font_metric::attachment_point (const string&) const { return Offset (0, 0); } @@ -158,10 +152,10 @@ Font_metric::sub_fonts () const Stencil Font_metric::text_stencil (Output_def *state, - string, bool) const + const string&, bool) const { (void) state; - + programming_error ("Cannot get a text stencil from this font"); return Stencil (Box (), SCM_EOL); }