X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=ba8ebd6fd8c700fbe4d1fd28160631ac478068c6;hb=55c7ef27b5382940b8afe785c94b744c24b98473;hp=e40724976a7eab34216f5f26553e5cd8d6608209;hpb=7c9b553acad88d5cd62461989f0f20652dc04dda;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index e40724976a..ba8ebd6fd8 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -1,60 +1,191 @@
 /*
   note-column.cc -- implement Note_column
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-column.hh"
-#include "debug.hh"
-#include "script.hh"
-#include "notehead.hh"
+
+#include <cmath>		// ceil
+using namespace std;
+
+#include "accidental-placement.hh"
+#include "axis-group-interface.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "note-head.hh"
+#include "output-def.hh"
+#include "pointer-group-interface.hh"
+#include "rest.hh"
+#include "staff-symbol-referencer.hh"
 #include "stem.hh"
+#include "warn.hh"
 
-IMPLEMENT_STATIC_NAME(Note_column);
+/*
+  TODO: figure out if we can prune this class. This is just an
+  annoying layer between (rest)collision & (note-head + stem)
+*/
 
-void
-Note_column::add(Stem*stem_l)
+bool
+Note_column::has_rests (Grob *me)
 {
-    stem_l_ = stem_l;
-    add_support(stem_l);
+  return unsmob_grob (me->get_object ("rest"));
 }
 
-void
-Note_column::add(Notehead* n_l)
+int
+Note_column::shift_compare (Grob *const &p1, Grob *const &p2)
 {
-    assert(!n_l->rest_b_);
-    head_l_arr_.push(n_l);
-    add_support(n_l);
+  SCM s1 = p1->get_property ("horizontal-shift");
+  SCM s2 = p2->get_property ("horizontal-shift");
+
+  int h1 = (scm_is_number (s1)) ? scm_to_int (s1) : 0;
+  int h2 = (scm_is_number (s2)) ? scm_to_int (s2) : 0;
+  return h1 - h2;
 }
 
-Note_column::Note_column()
+Item *
+Note_column::get_stem (Grob *me)
 {
-    stem_l_ = 0;
-    h_shift_b_ =false;
-    dir_i_ =0;
+  SCM s = me->get_object ("stem");
+  return unsmob_item (s);
+}
+
+Slice
+Note_column::head_positions_interval (Grob *me)
+{
+  Slice iv;
+
+  iv.set_empty ();
+
+  extract_grob_set (me, "note-heads", heads);
+  for (vsize i = 0; i < heads.size (); i++)
+    {
+      Grob *se = heads[i];
+
+      int j = Staff_symbol_referencer::get_rounded_position (se);
+      iv.unite (Slice (j, j));
+    }
+  return iv;
+}
+
+Direction
+Note_column::dir (Grob *me)
+{
+  Grob *stem = unsmob_grob (me->get_object ("stem"));
+  if (stem && Stem::has_interface (stem))
+    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;
 }
 
 void
-Note_column::sort()
+Note_column::set_stem (Grob *me, Grob *stem)
 {
-    head_l_arr_.sort( Notehead::compare);
+  me->set_object ("stem", stem->self_scm ());
+  Axis_group_interface::add_element (me, stem);
 }
-    
-Interval_t<int>
-Note_column::head_positions_interval()const
+
+Grob *
+Note_column::get_rest (Grob *me)
 {
-    (    (Note_column*)this)->sort();
-    return Interval_t<int> ( head_l_arr_[0]->position_i_, 
-			     head_l_arr_.top()->position_i_);
+  return unsmob_grob (me->get_object ("rest"));
+}
 
+void
+Note_column::add_head (Grob *me, Grob *h)
+{
+  bool both = false;
+  if (Rest::has_interface (h))
+    {
+      extract_grob_set (me, "note-heads", heads);
+      if (heads.size ())
+	both = true;
+      else
+	me->set_object ("rest", h->self_scm ());
+    }
+  else if (Note_head::has_interface (h))
+    {
+      if (unsmob_grob (me->get_object ("rest")))
+	both = true;
+      Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h);
+    }
+
+  if (both)
+    me->warning (_ ("can't have note heads and rests together on a stem"));
+  else
+    Axis_group_interface::add_element (me, h);
 }
 
+/**
+   translate the rest symbols vertically by amount DY, but only if
+   they have no staff-position set.
+*/
+void
+Note_column::translate_rests (Grob *me, int dy)
+{
+  Grob *r = unsmob_grob (me->get_object ("rest"));
+  if (r && !scm_is_number (r->get_property ("staff-position")))
+    {
+      r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS);
+      Grob *p = r->get_parent (Y_AXIS);
+      p->flush_extent_cache (Y_AXIS);
+    }
+}
 
 void
-Note_column::do_pre_processing()
+Note_column::set_dotcol (Grob *me, Grob *d)
+{
+  Axis_group_interface::add_element (me, d);
+}
+
+Grob *
+Note_column::first_head (Grob *me)
+{
+  Grob *st = get_stem (me);
+  return st ? Stem::first_head (st) : 0;
+}
+
+/*
+  Return the first Accidentals grob that we find in a note-head.
+*/
+Grob *
+Note_column::accidentals (Grob *me)
+{
+  extract_grob_set (me, "note-heads", heads);
+  Grob *acc = 0;
+  for (vsize i = 0; i < heads.size (); i++)
+    {
+      Grob *h = heads[i];
+      acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
+      if (acc)
+	break;
+    }
+
+  if (!acc)
+    return 0;
+
+  if (Accidental_placement::has_interface (acc->get_parent (X_AXIS)))
+    return acc->get_parent (X_AXIS);
+
+  /* compatibility. */
+  return acc;
+}
+
+Grob *
+Note_column::arpeggio (Grob *me)
 {
-    if (!dir_i_)
-	dir_i_ = stem_l_->dir_i_;
+  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");