*** empty log message ***

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
new file mode 100644 (file)
index 0000000..7fab468
--- /dev/null
+++ b/lily/include/open-type-font.hh
@@ -0,0 +1,35 @@
+/*
+  open-type-font.hh -- declare Open_type_font
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+*/
+
+#ifndef OPEN_TYPE_FONT_HH
+#define OPEN_TYPE_FONT_HH
+
+#include "freetype.hh"
+#include "font-metric.hh"
+
+class Open_type_font : public Font_metric
+{
+  FT_Face face_; /* handle to face object */ 
+public:
+  static SCM make_otf (String);
+  virtual ~Open_type_font();
+  virtual Box get_indexed_char (int) const;
+  virtual int name_to_index (String) const;
+#if 0
+  virtual int count () const;
+  virtual int index_to_ascii (int) const;
+  virtual Box get_ascii_char (int) const;
+  virtual Offset get_indexed_wxwy (int) const;
+  virtual Real design_size () const;
+#endif
+};
+
+
+#endif /* OPEN_TYPE_FONT_HH */
+

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index ac30e89b703758687e12f7951f06e4d89cb491ce..b33031e04bb583fa8ab4c3894f15aeccdbbaa1b5 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -7,7 +7,6 @@
 
 */
 
-#if 0
 #include "warn.hh"
 #include "open-type-font.hh"
 
@@ -58,7 +57,7 @@ Open_type_font::get_indexed_char (int signed_idx)
 int
 Open_type_font::name_to_index (String nm)
 {
-  
+  return 0;
 }
 
 
@@ -67,4 +66,3 @@ Open_type_font::get_design_size () const
 {
   return 20.0;
 }
-#endif