X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstem.hh;h=27fe988b615bb33436ee152317bf027a82ab59ec;hb=49405d36fc7012c747bbd4c6945b10d47e5bdd4f;hp=bd6b297191930400bb47db1fe2add3687213a2ca;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index bd6b297191..27fe988b61 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -1,20 +1,34 @@
 /*
-  stem.hh -- declare Stem
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  Copyright (C) 1996--2011 Han-Wen Nienhuys
+
+  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 STEM_HH
 #define STEM_HH
 
+#include "std-vector.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "stem-info.hh"
+#include "grob-interface.hh"
 
 class Stem
 {
 public:
-  static Array<int> note_head_positions (Grob *);
+  static vector<int> note_head_positions (Grob *);
   static int duration_log (Grob *);
   static void set_beaming (Grob *, int, Direction d);
   static int get_beaming (Grob *, Direction d);
@@ -32,11 +46,13 @@ public:
   static Real thickness (Grob *);
   static int head_count (Grob *);
   static bool is_invisible (Grob *);
+  static bool is_normal_stem (Grob *);
+  static bool is_cross_staff (Grob *);
   static Interval head_positions (Grob *);
   static Real stem_end_position (Grob *);
   static Stencil flag (Grob *);
   static Stencil get_translated_flag (Grob*);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static void set_spacing_hints (Grob *);
   
   DECLARE_SCHEME_CALLBACK (print, (SCM));
@@ -49,6 +65,9 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_stem_info, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
   DECLARE_SCHEME_CALLBACK (width, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_flag, (SCM));
 };
 #endif