Clean fonts and docs makefiles, trying to fix 'make -j' race conditions

[lilypond.git] / lily / line-spanner.cc

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 63970467268b6432948ef2c0fdaded5401e3675b..2d43a71fa4f0006943990e89e390fcdf4c71b28b 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -38,6 +38,7 @@ class Line_spanner
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_left_bound_info, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_left_bound_info_and_text, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_right_bound_info, (SCM));
@@ -74,8 +75,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
                                 ? ly_symbol2scm ("left-broken")
                                 : ly_symbol2scm ("right-broken"), bound_details, SCM_EOL);
 
-      for (SCM s = scm_reverse (extra); scm_is_pair (s); s = scm_cdr (s))
-        details = scm_cons (scm_car (s), details);
+      details = scm_append (scm_list_2 (extra, details));
     }
 
   if (details == SCM_BOOL_F)
@@ -200,6 +200,22 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
   return details;
 }
 
+MAKE_SCHEME_CALLBACK (Line_spanner, calc_cross_staff, 1);
+SCM
+Line_spanner::calc_cross_staff (SCM smob)
+{
+  Spanner *me = unsmob_spanner (smob);
+  if (!me)
+    return SCM_BOOL_F;
+
+  if (to_boolean (me->get_bound (LEFT)->get_property ("non-musical"))
+      || to_boolean (me->get_bound (RIGHT)->get_property ("non-musical")))
+    return SCM_BOOL_F;
+
+  return scm_from_bool (Staff_symbol_referencer::get_staff_symbol (me->get_bound (LEFT))
+                        != Staff_symbol_referencer::get_staff_symbol (me->get_bound (RIGHT)));
+}
+
 MAKE_SCHEME_CALLBACK (Line_spanner, calc_right_bound_info, 1);
 SCM
 Line_spanner::calc_right_bound_info (SCM smob)
@@ -254,8 +270,7 @@ Line_spanner::print (SCM smob)
 
   Drul_array<Offset> span_points;
 
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       Offset z (robust_scm2double (ly_assoc_get (ly_symbol2scm ("X"),
                                                  bounds[d], SCM_BOOL_F), 0.0),
@@ -264,7 +279,6 @@ Line_spanner::print (SCM smob)
 
       span_points[d] = z;
     }
-  while (flip (&d) != LEFT);
 
   Drul_array<Real> gaps (0, 0);
   Drul_array<bool> arrows (0, 0);
@@ -275,7 +289,7 @@ Line_spanner::print (SCM smob)
   Real magstep
     = pow (2, robust_scm2double (me->get_property ("font-size"), 0.0) / 6);
 
-  do
+  for (LEFT_and_RIGHT (d))
     {
       gaps[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("padding"),
                                                  bounds[d], SCM_BOOL_F), 0.0);
@@ -288,15 +302,13 @@ Line_spanner::print (SCM smob)
       if (!common_y[d])
         common_y[d] = me;
     }
-  while (flip (&d) != LEFT);
 
   Grob *my_common_y = common_y[LEFT]->common_refpoint (common_y[RIGHT], Y_AXIS);
 
   if (!simple_y)
     {
-      do
+      for (LEFT_and_RIGHT (d))
         span_points[d][Y_AXIS] += common_y[d]->relative_coordinate (my_common_y, Y_AXIS);
-      while (flip (&d) != LEFT);
     }
 
   Interval normalized_endpoints = robust_scm2interval (me->get_property ("normalized-endpoints"), Interval (0, 1));
@@ -313,7 +325,7 @@ Line_spanner::print (SCM smob)
     }
 
   Stencil line;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       span_points[d] += -d * gaps[d] * magstep * dz.direction ();
 
@@ -334,15 +346,13 @@ Line_spanner::print (SCM smob)
           line.add_stencil (s);
         }
     }
-  while (flip (&d) != LEFT);
 
-  do
+  for (LEFT_and_RIGHT (d))
     {
       if (stencils[d])
         span_points[d] += dz_dir *
                           (stencils[d]->extent (X_AXIS)[-d] / dz_dir[X_AXIS]);
     }
-  while (flip (&d) != LEFT);
 
   Offset adjust = dz.direction () * Staff_symbol_referencer::staff_space (me);