Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / note-column.cc

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 787773019ed7f7eadf5684989807f9dd6ccde98c..ba8ebd6fd8c700fbe4d1fd28160631ac478068c6 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,21 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-column.hh"
 
-#include <math.h>              // ceil
+#include <cmath>               // ceil
+using namespace std;
 
+#include "accidental-placement.hh"
 #include "axis-group-interface.hh"
-#include "stem.hh"
-#include "warn.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "note-head.hh"
 #include "output-def.hh"
-#include "staff-symbol-referencer.hh"
+#include "pointer-group-interface.hh"
 #include "rest.hh"
-#include "note-head.hh"
-#include "accidental-placement.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "warn.hh"
 
 /*
   TODO: figure out if we can prune this class. This is just an
@@ -56,7 +60,7 @@ Note_column::head_positions_interval (Grob *me)
   iv.set_empty ();
 
   extract_grob_set (me, "note-heads", heads);
-  for (int i = 0; i < heads.size(); i++) 
+  for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *se = heads[i];
 
@@ -71,9 +75,13 @@ Note_column::dir (Grob *me)
 {
   Grob *stem = unsmob_grob (me->get_object ("stem"));
   if (stem && Stem::has_interface (stem))
-    return Stem::get_direction (stem);
-  else if (scm_is_pair (me->get_object ("note-heads")))
-    return (Direction)sign (head_positions_interval (me).center ());
+    return get_grob_direction (stem);
+  else
+    {
+      extract_grob_set (me, "note-heads", heads);
+      if (heads.size ())
+       return (Direction)sign (head_positions_interval (me).center ());
+    }
 
   programming_error ("note column without heads and stem");
   return CENTER;
@@ -83,7 +91,6 @@ void
 Note_column::set_stem (Grob *me, Grob *stem)
 {
   me->set_object ("stem", stem->self_scm ());
-  me->add_dependency (stem);
   Axis_group_interface::add_element (me, stem);
 }
 
@@ -155,7 +162,7 @@ Note_column::accidentals (Grob *me)
 {
   extract_grob_set (me, "note-heads", heads);
   Grob *acc = 0;
-  for (int i = 0; i < heads.size(); i++) 
+  for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *h = heads[i];
       acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
@@ -173,7 +180,12 @@ Note_column::accidentals (Grob *me)
   return acc;
 }
 
+Grob *
+Note_column::arpeggio (Grob *me)
+{
+  return unsmob_grob (me->get_object ("arpeggio"));
+}
+
 ADD_INTERFACE (Note_column, "note-column-interface",
               "Stem and noteheads combined",
               "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
-