X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=d74c8157ca9f50003aa1777d9cb35ed3d8923b19;hb=378c9a561c8ce179398a88066e803aba6ea00afc;hp=71ba92175385924685ab99e6f3b19ac172e48bc4;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 71ba921753..d74c8157ca 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,8 +30,14 @@
 
 typedef std::map<FT_UInt, FT_ULong> Index_to_charcode_map;
 
-class Font_metric
+class Font_metric : public Smob<Font_metric>
 {
+public:
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static const char type_p_name_[];
+  virtual ~Font_metric ();
+private:
   DECLARE_CLASSNAME (Font_metric);
 
 public:
@@ -54,7 +60,6 @@ public:
   virtual Stencil find_by_name (string) const;
   virtual SCM sub_fonts () const;
   virtual SCM font_file_name () const;
-  DECLARE_SMOBS (Font_metric);
 
 private:
   /* No copying, no implicit copy constructor.  */
@@ -66,7 +71,6 @@ protected:
   Font_metric ();
 };
 
-DECLARE_UNSMOB (Font_metric, metrics);
 
 char *pfb2pfa (Byte const *pfb, int length);