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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 7f3168299e..21433d2403 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -21,15 +21,14 @@
 #define FONT_METRIC_HH
 
 #include "box.hh"
+#include "freetype.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "freetype.hh"
 
 #include <map>
-using namespace std;
 
-typedef map<FT_UInt, FT_ULong> Index_to_charcode_map;
+typedef std::map<FT_UInt, FT_ULong> Index_to_charcode_map;
 
 class Font_metric
 {
@@ -39,31 +38,20 @@ 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;
   virtual Offset attachment_point (string) const;
   virtual Offset get_indexed_wxwy (size_t) const;
-  virtual Box get_indexed_char (size_t index) const;
-  virtual Box get_ascii_char (size_t ascii) const;
-
-  /*
-    WTF are these vsize ?
-
-    Font_metric is not related to vector<> 
-   */
+  virtual Box get_indexed_char_dimensions (size_t index) const;
   virtual size_t name_to_index (string) const;
   virtual size_t index_to_charcode (size_t) const;
-  virtual size_t index_to_ascii (size_t) const;
   virtual Real design_size () const;
   virtual Stencil find_by_name (string) const;
-  virtual Stencil get_indexed_char_stencil (size_t k) const;
-  virtual Stencil get_ascii_char_stencil (size_t k) const;
   virtual SCM sub_fonts () const;
   virtual SCM font_file_name () const;
   DECLARE_SMOBS (Font_metric);
@@ -80,12 +68,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);