X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstem.hh;h=23ece790d2cb5913c852db6ffecf023488f4b683;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=fa9f65bccc07c37e6145b4356f22c2b88bbd6c0f;hpb=f1b93c0d52ef9229f8b58acc2ec8207ed50f5bee;p=lilypond.git

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index fa9f65bccc..23ece790d2 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--2005 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 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 *, bool filter = false);
   static int duration_log (Grob *);
   static void set_beaming (Grob *, int, Direction d);
   static int get_beaming (Grob *, Direction d);
@@ -26,29 +40,44 @@ public:
   static void add_head (Grob *me, Grob *n);
   static Stem_info get_stem_info (Grob *);
   static Real chord_start_y (Grob *);
-  static Direction get_direction (Grob *);
-  static void set_stemend (Grob *, Real);
-  static Direction get_default_dir (Grob *);
+  static void set_stem_positions (Grob *, Real);
+  static void cache_pure_height (Grob *, Interval, Interval);
   static Slice beam_multiplicity (Grob *);
+  static Direction get_default_dir (Grob *);
   static Real thickness (Grob *);
+  static Real beam_end_corrective (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 get_default_stem_end_position (Grob *me);
-  static void position_noteheads (Grob *);
-  static Real stem_end_position (Grob *);
-  static Stencil flag (Grob *);
-  static Stencil get_translated_flag (Grob*);
-  static bool has_interface (Grob *);
+  static Interval internal_pure_height (Grob *, bool);
+  static Interval internal_height (Grob *, bool);
+  static bool is_valid_stem (Grob *);
+  static Grob *get_reference_head (Grob *);
+  static Real internal_calc_stem_end_position (Grob *, bool);
+  static Real internal_calc_stem_begin_position (Grob *, bool);
+
+  DECLARE_GROB_INTERFACE ();
   static void set_spacing_hints (Grob *);
+  static Grob *flag (Grob *);
 
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (offset_callback, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
-  DECLARE_SCHEME_CALLBACK (width_callback, (SCM smob, SCM axis));
-  DECLARE_SCHEME_CALLBACK (height, (SCM, SCM));
-
-private:
-  static void calc_stem_info (Grob *);
+  DECLARE_SCHEME_CALLBACK (calc_default_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (offset_callback, (SCM element));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_length, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_calc_length, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (calc_stem_begin_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_calc_stem_begin_position, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (calc_stem_end_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_calc_stem_end_position, (SCM, SCM, SCM));
+  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));
 };
 #endif