X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=7e8f1bd964982762c941a2ecba9f1a5913a3c2bb;hb=46173612585e09fbad842963aaf61ac9f86317e5;hp=4085140311fc8ea866c14a63736ab41d01d19d32;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 4085140311..7e8f1bd964 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2011 Han-Wen Nienhuys + Copyright (C) 2000--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 @@ -28,7 +28,7 @@ Font_metric * Font_interface::get_default_font (Grob *me) { - Font_metric *fm = unsmob_metrics (me->get_property ("font")); + Font_metric *fm = Font_metric::unsmob (me->get_property ("font")); if (!fm) { SCM chain = music_font_alist_chain (me); @@ -61,15 +61,15 @@ Font_interface::text_font_alist_chain (Grob *g) } ADD_INTERFACE (Font_interface, - "Any symbol that is typeset through fixed sets of glyphs," - " (i.e., fonts).", + "Any symbol that is typeset through fixed sets of glyphs," + " (i.e., fonts).", - /* properties */ - "font " - "font-encoding " - "font-family " - "font-name " - "font-series " - "font-shape " - "font-size " - ); + /* properties */ + "font " + "font-encoding " + "font-family " + "font-name " + "font-series " + "font-shape " + "font-size " + );