X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=7f2aad917c184aa763e59e65650764c9f3c5fe91;hb=40652d626dc52d09f28ec25e1a986c036ac171ae;hp=d6236e042ac6790ece047cfd779788e30bfdb28d;hpb=ffbaef8018d42f1636c9cd47885fbc187a08f3a8;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index d6236e042a..7f2aad917c 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -1,44 +1,66 @@
-/*   
-  font-metric.hh -- declare Font_metric
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef FONT_METRIC_HH
 #define FONT_METRIC_HH
 
 #include "box.hh"
-#include "lily-guile.hh"
-#include "smobs.hh"
 #include "lily-proto.hh"
-#include "string.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 description_;
-  String file_name_;
-  
-  virtual int count () const;
-  virtual Offset get_indexed_wxwy (int) const;
-  virtual Box get_indexed_char (int index) const;
-  virtual Box get_ascii_char (int ascii) const;
-  virtual int name_to_index (String) const;
-  virtual int index_to_ascii (int) const;
+  string file_name_;
+
+  // 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_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 (int k) const;
-  virtual Stencil get_ascii_char_stencil (int k) const;
-  virtual String coding_scheme () const;
-  
-  DECLARE_SMOBS (Font_metric,);
+  virtual Stencil find_by_name (string) const;
+  virtual SCM sub_fonts () const;
+  virtual SCM font_file_name () const;
+  DECLARE_SMOBS (Font_metric);
 
 private:
   /* No copying, no implicit copy constructor.  */
-  Font_metric (Font_metric const&);
+  Font_metric (Font_metric const &);
 
 protected:
   virtual void derived_mark () const;
@@ -46,15 +68,10 @@ protected:
   Font_metric ();
 };
 
-int get_encoded_index (Font_metric *m, String input_coding, int code);
+int get_encoded_index (Font_metric *m, string input_coding, int code);
 
-struct Simple_font_metric : public Font_metric
-{
-public:
-  
-};
-  
+DECLARE_UNSMOB (Font_metric, metrics);
 
-DECLARE_UNSMOB(Font_metric, metrics);
+char *pfb2pfa (Byte const *pfb, int length);
 
 #endif /* FONT_METRIC_HH */