* lily/include/translator.hh (ENTER_DESCRIPTION): add

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index fc6edcb963537c62bd82568a043d5046066a468e..3b33e6e198f4d8fcfbfc5faf0a20e64f4abc0fa7 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
@@ -16,6 +16,10 @@
 #include "axis-group-interface.hh"
 #include "stem.hh"
 
+/*
+  TODO: let Dot_column communicate with stem via Note_column.
+ */
+
 MAKE_SCHEME_CALLBACK (Dot_column,force_shift_callback,2);
 SCM
 Dot_column::force_shift_callback (SCM element_smob, SCM axis)
@@ -39,8 +43,10 @@ Dot_column::side_position (SCM element_smob, SCM axis)
 
   Grob * stem = unsmob_grob (me->get_grob_property ("stem"));
   if (stem
-      && !Stem::beam_l (stem)
-      && Stem::flag_i (stem))
+      && !Stem::get_beam (stem)
+      && Stem::duration_log (stem) > 2
+      && !Stem::invisible_b (stem)
+      )
     {
       /*
        trigger stem end & direction calculation.
@@ -89,7 +95,7 @@ Dot_column::do_shifts (SCM l)
   int conflicts = 0;
   for (int i=0; i < dots.size (); i++)
     {
-      Real p = Staff_symbol_referencer::position_f (dots[i]);
+      Real p = Staff_symbol_referencer::get_position (dots[i]);
       for (int j=0; j < taken_posns.size (); j++)
        {
          if (taken_posns[j] == (int) p)
@@ -120,11 +126,6 @@ Dot_column::do_shifts (SCM l)
   return SCM_UNSPECIFIED;
 }
 
-bool
-Dot_column::has_interface (Grob*m)
-{
-  return m && m->has_interface (ly_symbol2scm ("dot-column-interface"));
-}
 
 
 void
@@ -141,3 +142,10 @@ Dot_column::add_head (Grob * me, Grob *rh)
     }
 }
 
+
+
+
+ADD_INTERFACE (Dot_column, "dot-column-interface",
+  "Interface that groups dots so they form a column",
+  "direction stem");
+