X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=4d4694cb21edf5abca8c7da11f8a6bf2e9b89711;hb=450dba56eaa24cd58f9d9d3c4ab5c73bd4c57742;hp=71ba92175385924685ab99e6f3b19ac172e48bc4;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 71ba921753..4d4694cb21 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,31 +30,36 @@
 
 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:
   SCM description_;
-  string file_name_;
+  std::string file_name_;
 
-  // Return stencil for given string. output_state may be modified to
+  // Return stencil for given std::string. output_state may be modified to
   // record the font.
   virtual Stencil text_stencil (Output_def *output_state,
-                                const string &text, bool music) const;
+                                const std::string &text, bool music) const;
 
-  virtual string font_name () const;
+  virtual std::string font_name () const;
   virtual size_t count () const;
-  virtual Offset attachment_point (const string&) const;
+  virtual Offset attachment_point (const std::string&) const;
   virtual Offset get_indexed_wxwy (size_t) const;
   virtual Box get_indexed_char_dimensions (size_t index) const;
-  virtual size_t name_to_index (string) const=0;
+  virtual size_t name_to_index (std::string) const=0;
   virtual size_t index_to_charcode (size_t) const;
   virtual Real design_size () const;
-  virtual Stencil find_by_name (string) const;
+  virtual Stencil find_by_name (std::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);