]> git.donarmstrong.com Git - lilypond.git/commitdiff
(print): try Tie_column::set_directions () if
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 23 Aug 2005 22:34:53 +0000 (22:34 +0000)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 23 Aug 2005 22:34:53 +0000 (22:34 +0000)
control-points not yet defined.

lily/tie-column.cc
lily/tie.cc

index 4f6eae212c5bb09487cb3b6fbdd4df3279959e39..cd2eed2b8d7015d6991dde75694ff038e727d624 100644 (file)
@@ -159,14 +159,14 @@ set_chord_outlines (Drul_array< Array<Skyline_entry> > *skyline_drul,
            continue;
 
          Grob *dots = unsmob_grob (head->get_object ("dot"));
-         if (dots)
+         if (dots && d == LEFT)
            {
              Interval x = dots->extent (common, X_AXIS);
              Real p = Staff_symbol_referencer::get_position (dots);
              
              Interval y (-1,1);
              y *= (staff_space /4);
-             y.translate ( p * staff_space * .5);
+             y.translate (p * staff_space * .5);
 
              insert_extent_into_skyline (&skyline_drul->elem_ref (d),
                                          Box (x,y), Y_AXIS, -d);
index 52c323d876480df4a60bfa1be0e14dff73a062a7..4e103bb2adb7e5c29eb95938fda3df8bf3bae9ed 100644 (file)
@@ -347,8 +347,11 @@ Tie::get_configuration (Grob *me_grob, Grob *common,
 
   if (skylines)
     {
-      Real y = staff_space * 0.5 * staff_position;
+      Real half_space = 0.5 * staff_space;
+      Real y = staff_position * half_space;
+      
       attachments = get_skyline_attachment (*skylines, y);
+      
       attachments.widen (-gap);
     }
   conf->attachment_x_ = attachments;
@@ -410,6 +413,19 @@ Tie::print (SCM smob)
     set_direction (me);
       
   SCM cp = me->get_property ("control-points");
+  if (!scm_is_pair (cp))
+    {
+      /*
+       UGH.  dependency tracking!
+       */
+      if (Tie_column::has_interface (me->get_parent (Y_AXIS)))
+       {
+         Tie_column::set_directions (me->get_parent (Y_AXIS));
+       }
+
+      cp = me->get_property ("control-points");
+    }
+  
   if (!scm_is_pair (cp))
     {
       set_default_control_points (me);