Use the same line thickness as circle markup for box markup.

[lilypond.git] / lily / side-position-interface.cc

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 96751edf2c5658ad321254e7a774d798332a1c6d..19d9a88dc8ac86676ff2496a636c77167dc5dead 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "side-position-interface.hh"
@@ -12,17 +12,17 @@
 #include <algorithm>
 using namespace std;
 
-#include "note-head.hh"
-#include "warn.hh"
+#include "directional-element-interface.hh"
+#include "grob.hh"
 #include "main.hh"
-#include "staff-symbol-referencer.hh"
+#include "misc.hh"
+#include "note-head.hh"
 #include "pointer-group-interface.hh"
-#include "directional-element-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
+#include "stem.hh"
 #include "string-convert.hh"
-#include "misc.hh"
-#include "grob.hh"
+#include "warn.hh"
 
 void
 Side_position_interface::add_support (Grob *me, Grob *e)
@@ -80,9 +80,20 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
        dim.unite (staff_extents);
     }
 
+  Direction dir = get_grob_direction (me);
+
   for (vsize i = 0; i < support.size (); i++)
     {
       Grob *e = support[i];
+
+      // In the case of a stem, we will find a note head as well
+      // ignoring the stem solves cyclic dependencies if the stem is
+      // attached to a cross-staff beam.
+      if (a == Y_AXIS
+         && Stem::has_interface (e)
+         && dir == - get_grob_direction (e))
+       continue;
+      
       if (e)
        if (use_extents)
          dim.unite (e->maybe_pure_extent (common, a, pure, start, end));
@@ -96,8 +107,6 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
   if (dim.is_empty ())
     dim = Interval (0, 0);
 
-  Direction dir = get_grob_direction (me);
-
   Real off = me->get_parent (a)->maybe_pure_coordinate (common, a, pure, start, end);
   Real minimum_space = ss * robust_scm2double (me->get_property ("minimum-space"), -1);
 
@@ -177,21 +186,21 @@ axis_aligned_side_helper (SCM smob, Axis a, bool pure, int start, int end, SCM c
 }
 
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, x_aligned_side, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, x_aligned_side, 2, 1, "");
 SCM
 Side_position_interface::x_aligned_side (SCM smob, SCM current_off)
 {
   return axis_aligned_side_helper (smob, X_AXIS, false, 0, 0, current_off);
 }
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, y_aligned_side, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, y_aligned_side, 2, 1, "");
 SCM
 Side_position_interface::y_aligned_side (SCM smob, SCM current_off)
 {
   return axis_aligned_side_helper (smob, Y_AXIS, false, 0, 0, current_off);
 }
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, pure_y_aligned_side, 4, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, pure_y_aligned_side, 4, 1, "");
 SCM
 Side_position_interface::pure_y_aligned_side (SCM smob, SCM start, SCM end, SCM cur_off)
 {
@@ -201,6 +210,17 @@ Side_position_interface::pure_y_aligned_side (SCM smob, SCM start, SCM end, SCM
                                   cur_off);
 }
 
+MAKE_SCHEME_CALLBACK (Side_position_interface, calc_cross_staff, 1)
+SCM
+Side_position_interface::calc_cross_staff (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "side-support-elements", elts);
+
+  Grob *common = common_refpoint_of_array (elts, me->get_parent (Y_AXIS), Y_AXIS);
+  return scm_from_bool (common != me->get_parent (Y_AXIS));
+}
+
 SCM
 Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, int end,
                                       Real *current_off)
@@ -236,7 +256,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
                o += dir * 0.5 * ss;
            }
        }
-      else if (scm_is_number (me->get_property ("staff-padding")))
+      else if (scm_is_number (me->get_property ("staff-padding")) && dir)
        {
          Interval iv = me->maybe_pure_extent (me, a, pure, start, end);