Imported Upstream version 2.18.0

[lilypond.git] / lily / include / font-metric.hh

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 4743e42b609ed794c255697c29a303d2f75599af..4c11989729ffc50a78323ef77ed209d8b5e6d703 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -41,14 +41,14 @@ 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;
+                                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);