X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=f194dee35ebb1607ce4f88ce4a26c533e5b3a1c8;hb=3863f416bea79ef29dded3b1b8a3f61419098f7a;hp=e14ebb4e147d0b45197b12608fef1b2863988f8a;hpb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index e14ebb4e14..f194dee35e 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -1,51 +1,82 @@
-/*   
+/*
   font-metric.hh -- declare Font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef FONT_METRIC_HH
 #define FONT_METRIC_HH
 
 #include "box.hh"
-#include "lily-guile.hh"
-#include "smobs.hh"
 #include "lily-proto.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
+#include "freetype.hh"
+
+#include <map>
+using namespace std;
 
-struct Font_metric
+typedef map<FT_UInt, FT_ULong> Index_to_charcode_map;
+
+class Font_metric
 {
+  DECLARE_CLASSNAME(Font_metric);
+
 public:
-  SCM name_;
-  virtual SCM description () const;
-  virtual Box get_char (int ascii, Real mag) const;
-  virtual Box text_dimension (String, Real mag = 1.0)  const;
-  virtual Molecule find_by_name (String, Real mag = 1.0) const;
+  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(Font_metric,);
 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
 {
-  virtual SCM description () const;
-  virtual Box text_dimension (String, Real) const;
-  virtual Molecule find_by_name (String, Real) const;
-  static SCM make_scaled_font_metric (Font_metric*, Real);
-protected:
-  Font_metric *orig_l_;
-  Real magnification_f_;
-  
-  Scaled_font_metric (Font_metric*,Real);
+  DECLARE_CLASSNAME(Simple_font_metric);
+public:
 };
 
-Font_metric * unsmob_metrics (SCM s);
+DECLARE_UNSMOB (Font_metric, metrics);
 
-#endif /* FONT_METRIC_HH */
+char *pfb2pfa (Byte const *pfb, int length);
 
+#endif /* FONT_METRIC_HH */