X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fopen-type-font.hh;h=76d015325591ab602900aa356146fb0cf4d8431c;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=315113a27f1a66478a7ef8c8a31e1564ede0f71f;hpb=5d3ad90b7bea98b61c01e00258360e234853aa9b;p=lilypond.git

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index 315113a27f..76d0153255 100644
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -1,58 +1,74 @@
 /*
-  open-type-font.hh -- declare Open_type_font
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2008 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 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);
-
-class Open_type_font : public Font_metric
-{
-  /* handle to face object */
-  FT_Face face_;
+void get_unicode_name (char *s, FT_ULong code);
+void get_glyph_index_name (char *s, FT_ULong code);
 
+struct Preinit_Open_type_font {
   SCM lily_subfonts_;
   SCM lily_character_table_;
   SCM lily_global_table_;
   SCM lily_index_to_bbox_table_;
+  Preinit_Open_type_font ();
+};
+
+class Open_type_font : Preinit_Open_type_font, public Font_metric
+{
+  /* handle to face object */
+  FT_Face face_;
+  string postscript_name_;
 
   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);
+string get_postscript_name (FT_Face face);
 
 #endif /* OPEN_TYPE_FONT_HH */