X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fopen-type-font.hh;h=f08d4fa71c5e53e338056aa929416ffb64a4b415;hb=ef9512388b15e1e5e2b3592299ffe489ac43abb4;hp=8cef269fe76d6c1ee1e63a01785bd8215d67a6a4;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index 8cef269fe7..f08d4fa71c 100644
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 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
@@ -20,12 +20,11 @@
 #ifndef OPEN_TYPE_FONT_HH
 #define OPEN_TYPE_FONT_HH
 
-
 #include "font-metric.hh"
 
 Index_to_charcode_map make_index_to_charcode_map (FT_Face face);
-void get_unicode_name (char*s, FT_ULong code);
-void get_glyph_index_name (char*s, FT_ULong code);
+void get_unicode_name (char *s, FT_ULong code);
+void get_glyph_index_name (char *s, FT_ULong code);
 
 class Open_type_font : public Font_metric
 {
@@ -40,30 +39,31 @@ class Open_type_font : public Font_metric
   Index_to_charcode_map index_to_charcode_map_;
   Open_type_font (FT_Face);
 
-  DECLARE_CLASSNAME(Open_type_font);
+  DECLARE_CLASSNAME (Open_type_font);
 public:
+  Real get_units_per_EM () const;
   SCM get_subfonts () const;
   SCM get_global_table () const;
   SCM get_char_table () const;
   SCM glyph_list () const;
-    
-  string get_otf_table (string tag) const;
-  static SCM make_otf (string);
+  SCM get_glyph_outline (size_t signed_idx) const;
+  Box get_glyph_outline_bbox (size_t signed_idx) const;
+  string get_otf_table (const string &tag) const;
+  static SCM make_otf (const string&);
   string font_name () const;
   ~Open_type_font ();
-  Offset attachment_point (string) const;
+  Offset attachment_point (const string&) const;
   size_t count () const;
-  Box get_indexed_char (size_t) const;
+  Box get_indexed_char_dimensions (size_t) const;
+  Box get_unscaled_indexed_char_dimensions (size_t) const;
   size_t name_to_index (string) const;
-  //size_t glyph_name_to_charcode (string) const;
   size_t index_to_charcode (size_t) const;
   void derived_mark () const;
   SCM sub_fonts () const;
   Real design_size () const;
 };
 
-string get_otf_table (FT_Face face, string tag);
-FT_Face open_ft_face (string str, FT_Long idx);
-
+string get_otf_table (FT_Face face, const string &tag);
+FT_Face open_ft_face (const string&, FT_Long idx);
 
 #endif /* OPEN_TYPE_FONT_HH */