X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=8346b4378a8c459a0b861a561c780552e25ce40e;hb=09bf9a18185476020686ff65b5d70b57051be780;hp=a26c2e565c13b5ec11342dec2395cf7c44ad45dd;hpb=fd7e615444cf58b38283a59b56d3457c07778397;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index a26c2e565c..8346b4378a 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -1,50 +1,82 @@
-/*   
+/*
   font-metric.hh -- declare Font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef FONT_METRIC_HH
 #define FONT_METRIC_HH
 
 #include "box.hh"
-#include "lily-guile.hh"
+#include "lily-proto.hh"
 #include "smobs.hh"
+#include "virtual-methods.hh"
+#include "freetype.hh"
 
-struct Character_metric
-{
-  virtual Box dimensions () const;
-  virtual ~Character_metric ();
-};
+#include <map>
+using namespace std;
+
+typedef map<FT_UInt, FT_ULong> Index_to_charcode_map;
 
-struct Font_metric
+class Font_metric
 {
-  Font_metric ();
-  String name_str_;
-  virtual SCM description () const;
-  virtual Character_metric const *get_char (int ascii, bool warn) const; 
-  virtual ~Font_metric ();
-  virtual Box text_dimension (String) const;
+  DECLARE_CLASSNAME(Font_metric);
+
+public:
+  SCM description_;
+  string file_name_;
+
+  virtual Stencil text_stencil (string) const;
+  virtual Stencil word_stencil (string) const;
+
+  // ugh.
+  virtual Box text_dimension (string) 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 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);
 
-  DECLARE_SMOBS;
 private:
-  Font_metric (Font_metric const&); // no copy.
+  /* No copying, no implicit copy constructor.  */
+  Font_metric (Font_metric const &);
+
+protected:
+  virtual void derived_mark () const;
+
+  Font_metric ();
 };
 
+int get_encoded_index (Font_metric *m, string input_coding, int code);
 
-struct Scaled_font_metric : public Font_metric
+class Simple_font_metric : public Font_metric
 {
-  Font_metric *orig_l_;
-  int magstep_i_;
-  
-  Scaled_font_metric (Font_metric*, int);
-  virtual SCM description () const;
-  virtual Box text_dimension (String) const;
+  DECLARE_CLASSNAME(Simple_font_metric);
+public:
 };
 
+DECLARE_UNSMOB (Font_metric, metrics);
 
-#endif /* FONT_METRIC_HH */
+char *pfb2pfa (Byte const *pfb, int length);
 
+#endif /* FONT_METRIC_HH */