X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=f2b6a0e1476c2e669a1917d47f8d17343960ac37;hb=12a06e5c29a2f58081068ac7663f0d6a6d4bdf95;hp=899d80f821166ad95d10f6b0b0e9e11b495c078d;hpb=00b9619cea1020f6773f23df8764ef85ee2912bf;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 899d80f821..f2b6a0e147 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--2014 Han-Wen Nienhuys + Copyright (C) 1999--2015 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 @@ -63,6 +63,7 @@ Font_metric::Font_metric () } Font_metric::Font_metric (Font_metric const &) + : Smob () { } @@ -94,20 +95,19 @@ Font_metric::derived_mark () const } SCM -Font_metric::mark_smob () +Font_metric::mark_smob () const { derived_mark (); return description_; } int -Font_metric::print_smob (SCM s, SCM port, scm_print_state *) +Font_metric::print_smob (SCM port, scm_print_state *) const { - Font_metric *m = Font_metric::unsmob (s); scm_puts ("#<", port); - scm_puts (m->class_name (), port); + scm_puts (class_name (), port); scm_puts (" ", port); - scm_write (m->description_, port); + scm_write (description_, port); scm_puts (">", port); return 1; }