Merge branch 'lilypond/translation'

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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 2d00a270b724e77877b9254f7910947ad3f51739..c55693987ad232f611290abc74198a2bbab4001d 100644 (file)
--- 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
 {
@@ -41,27 +40,18 @@ public:
 
   // Return stencil for given string. output_state may be modified to
   // record the font.
-  virtual Stencil text_stencil (Output_def* output_state,
+  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 SCM sub_fonts () const;
   virtual SCM font_file_name () const;
   DECLARE_SMOBS (Font_metric);