Cleanup: remove Simple_font_metric, Font_metric::text_dimension

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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 7f3168299e322a16aa46d7a6da66aa0a52df2e94..b9dc5c7891d29ad84cf083725dfd133a7bcb6ef9 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -39,11 +39,10 @@ public:
   SCM description_;
   string file_name_;
 
-  virtual Stencil text_stencil (string, bool) const;
-  virtual Stencil word_stencil (string, bool) const;
-
-  // ugh.
-  virtual Box text_dimension (string) const;
+  // 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 string font_name () const;
   virtual size_t count () const;
@@ -80,12 +79,6 @@ protected:
 
 int get_encoded_index (Font_metric *m, string input_coding, int code);
 
-class Simple_font_metric : public Font_metric
-{
-  DECLARE_CLASSNAME(Simple_font_metric);
-public:
-};
-
 DECLARE_UNSMOB (Font_metric, metrics);
 
 char *pfb2pfa (Byte const *pfb, int length);