X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=71ba92175385924685ab99e6f3b19ac172e48bc4;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=21433d2403c6f21ef415cdf50b9a672ab34b87ec;hpb=b087ea53eddbea8cd2ee8b96a46e2d49c3d422c6;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 21433d2403..71ba921753 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2014 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
@@ -32,7 +32,7 @@ typedef std::map<FT_UInt, FT_ULong> Index_to_charcode_map;
 
 class Font_metric
 {
-  DECLARE_CLASSNAME(Font_metric);
+  DECLARE_CLASSNAME (Font_metric);
 
 public:
   SCM description_;
@@ -40,15 +40,15 @@ public:
 
   // Return stencil for given string. output_state may be modified to
   // record the font.
-  virtual Stencil text_stencil (Output_def* output_state,
-                                string text, bool music) const;
+  virtual Stencil text_stencil (Output_def *output_state,
+                                const string &text, bool music) const;
 
   virtual string font_name () const;
   virtual size_t count () const;
-  virtual Offset attachment_point (string) const;
+  virtual Offset attachment_point (const 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;
+  virtual size_t name_to_index (string) const=0;
   virtual size_t index_to_charcode (size_t) const;
   virtual Real design_size () const;
   virtual Stencil find_by_name (string) const;
@@ -66,8 +66,6 @@ protected:
   Font_metric ();
 };
 
-int get_encoded_index (Font_metric *m, string input_coding, int code);
-
 DECLARE_UNSMOB (Font_metric, metrics);
 
 char *pfb2pfa (Byte const *pfb, int length);