Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 69566653b2958eeff319253e93d410de3ad7bdc0..3ebddc69a015267561adb67a24a35a3f5a9a474e 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -3,14 +3,15 @@
 
   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 "dot-column.hh"
 
 #include <cstdio>
-#include <math.h>
+#include <cmath>
 #include <map>
+using namespace std;
 
 #include "dots.hh"
 #include "rhythmic-head.hh"
@@ -19,51 +20,38 @@
 #include "side-position-interface.hh"
 #include "axis-group-interface.hh"
 #include "stem.hh"
+#include "pointer-group-interface.hh"
 
 /*
   TODO: let Dot_column communicate with stem via Note_column.
 */
 
-MAKE_SCHEME_CALLBACK (Dot_column, force_shift_callback, 2);
+MAKE_SCHEME_CALLBACK (Dot_column, side_position, 1);
 SCM
-Dot_column::force_shift_callback (SCM element_smob, SCM axis)
+Dot_column::side_position (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
-  (void) axis;
-  assert (scm_to_int (axis) == Y_AXIS);
-  me = me->get_parent (X_AXIS);
-
-  if (!to_boolean (me->get_property ("positioning-done")))
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "dots", dots);
+  
+  for (vsize i = 0; i  < dots.size (); i++)
     {
-      me->set_property ("positioning-done", SCM_BOOL_T);
-
-      do_shifts (me);
+      Grob *head = dots[i]->get_parent (Y_AXIS);
+      Grob *stem = head ? unsmob_grob (head->get_object ("stem")) : 0;
+      if (stem
+         && !Stem::get_beam (stem)
+         && Stem::duration_log (stem) > 2
+         && !Stem::is_invisible (stem))
+       {
+         /*
+           trigger stem end & direction calculation.
+           
+           This will add the stem to the support if a flag collision happens.
+         */
+         stem->get_property ("stem-end-position");
+       }
     }
-  return scm_make_real (0.0);
-}
-
-MAKE_SCHEME_CALLBACK (Dot_column, side_position, 2);
-SCM
-Dot_column::side_position (SCM element_smob, SCM axis)
-{
-  Grob *me = unsmob_grob (element_smob);
-  (void) axis;
-  assert (scm_to_int (axis) == X_AXIS);
-
-  Grob *stem = unsmob_grob (me->get_object ("stem"));
-  if (stem
-      && !Stem::get_beam (stem)
-      && Stem::duration_log (stem) > 2
-      && !Stem::is_invisible (stem))
-    {
-      /*
-       trigger stem end & direction calculation.
 
-       This will add the stem to the support if a flag collision happens.
-      */
-      Stem::stem_end_position (stem);
-    }
-  return Side_position_interface::aligned_side (element_smob, axis);
+  return Side_position_interface::x_aligned_side (smob);
 }
 
 struct Dot_position
@@ -81,7 +69,7 @@ struct Dot_position
   }
 };
 
-typedef std::map<int, Dot_position> Dot_configuration;
+typedef map<int, Dot_position> Dot_configuration;
 
 /*
   Value CFG according.
@@ -146,7 +134,7 @@ shift_one (Dot_configuration const &cfg,
          int p = i->first;
          if (p == k)
            {
-             if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
+             if (Staff_symbol_referencer::on_line (i->second.dot_, p))
                p += d;
              else
                p += 2* d;
@@ -158,9 +146,7 @@ shift_one (Dot_configuration const &cfg,
          else
            {
              if (new_cfg.find (p) == new_cfg.end ())
-               {
-                 offset = 0;
-               }
+               offset = 0;
              new_cfg[p + offset] = i->second;
            }
        }
@@ -175,7 +161,7 @@ shift_one (Dot_configuration const &cfg,
          int p = i->first;
          if (p == k)
            {
-             if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
+             if (Staff_symbol_referencer::on_line (i->second.dot_, p))
                p += d;
              else
                p += 2* d;
@@ -187,9 +173,7 @@ shift_one (Dot_configuration const &cfg,
          else
            {
              if (new_cfg.find (p) == new_cfg.end ())
-               {
-                 offset = 0;
-               }
+               offset = 0;
 
              new_cfg[p + offset] = i->second;
            }
@@ -221,10 +205,12 @@ remove_collision (Dot_configuration &cfg, int p)
     }
 }
 
+MAKE_SCHEME_CALLBACK(Dot_column, calc_positioning_done, 1);
 SCM
-Dot_column::do_shifts (Grob *me)
+Dot_column::calc_positioning_done (SCM smob)
 {
-  Link_array<Grob> dots
+  Grob *me = unsmob_grob (smob);  
+  vector<Grob*> dots
     = extract_grob_array (me, "dots");
 
   { /*
@@ -232,7 +218,7 @@ Dot_column::do_shifts (Grob *me)
       dots when merging.
     */
     Grob *c = 0;
-    for (int i = dots.size (); i--;)
+    for (vsize i = dots.size (); i--;)
       {
        Grob *n = dots[i]->get_parent (Y_AXIS);
        if (c)
@@ -240,20 +226,20 @@ Dot_column::do_shifts (Grob *me)
        else
          c = n;
       }
-    for (int i = dots.size (); i--;)
+    for (vsize i = dots.size (); i--;)
       {
        Grob *n = dots[i]->get_parent (Y_AXIS);
        n->relative_coordinate (c, X_AXIS);
       }
   }
 
-  dots.sort (compare_position);
-  for (int i = dots.size (); i--;)
+  vector_sort (dots, &compare_position);
+  for (vsize i = dots.size (); i--;)
     if (!dots[i]->is_live ())
-      dots.del (i);
+      dots.erase (dots.begin () + i);
 
   Dot_configuration cfg;
-  for (int i = 0;i < dots.size (); i++)
+  for (vsize i = 0;i < dots.size (); i++)
     {
       Dot_position dp;
       dp.dot_ = dots[i];
@@ -274,17 +260,19 @@ Dot_column::do_shifts (Grob *me)
 
       remove_collision (cfg, p);
       cfg[p] = dp;
-      if (Staff_symbol_referencer::on_staffline (dp.dot_, p))
+      if (Staff_symbol_referencer::on_line (dp.dot_, p))
        remove_collision (cfg, p);
     }
 
   for (Dot_configuration::const_iterator i (cfg.begin ());
        i != cfg.end (); i++)
     {
+      /*
+       Junkme?
+       */
       Staff_symbol_referencer::set_position (i->second.dot_, i->first);
     }
-
-  return SCM_UNSPECIFIED;
+  return SCM_BOOL_T;
 }
 
 void
@@ -296,13 +284,20 @@ Dot_column::add_head (Grob *me, Grob *rh)
       Side_position_interface::add_support (me, rh);
 
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d);
-      d->add_offset_callback (Dot_column::force_shift_callback_proc, Y_AXIS);
+      d->set_property ("Y-offset", Grob::x_parent_positioning_proc);
       Axis_group_interface::add_element (me, d);
     }
 }
 
-ADD_INTERFACE (Dot_column, "dot-column-interface",
+ADD_INTERFACE (Dot_column,
+              "dot-column-interface",
+              
               "Groups dot objects so they form a column, and position dots so they do not "
               "clash with staff lines ",
-              "positioning-done direction stem");
+
+              /* properties */
+              "dots "
+              "positioning-done "
+              "direction "
+              );