Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index bda0ff9ebf4b5c75e7d290ff9fbb3b2d00d22d2c..92610d47e7db7f4866b49015bbfaa1df36b4e495 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -24,6 +24,7 @@
 #include "staff-symbol.hh"
 #include "stem.hh"
 #include "text-interface.hh"
+#include "tie.hh"
 #include "warn.hh"
 #include "slur-scoring.hh"
 
@@ -38,14 +39,14 @@ Slur::calc_direction (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "note-columns", encompasses);
 
-  if (encompasses.is_empty ())
+  if (encompasses.empty ())
     {
       me->suicide ();
       return SCM_BOOL_F;
     }
 
   Direction d = DOWN;
-  for (int i = 0; i < encompasses.size (); i++)
+  for (vsize i = 0; i < encompasses.size (); i++)
     {
       if (Note_column::dir (encompasses[i]) < 0)
        {
@@ -64,7 +65,8 @@ Slur::height (SCM smob)
 
   // FIXME uncached
   Stencil *m = me->get_stencil ();
-  return m ? ly_interval2scm (m->extent (Y_AXIS)) : ly_interval2scm (Interval ());
+  return m ? ly_interval2scm (m->extent (Y_AXIS))
+    : ly_interval2scm (Interval ());
 }
 
 /*
@@ -76,15 +78,18 @@ Slur::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "note-columns", encompasses);
-  if (encompasses.is_empty ())
+  if (encompasses.empty ())
     {
       me->suicide ();
       return SCM_EOL;
     }
 
   Real staff_thick = Staff_symbol_referencer::line_thickness (me);
-  Real base_thick = robust_scm2double (me->get_property ("thickness"), 1);
-  Real thick = base_thick * staff_thick;
+  Real base_thick = staff_thick
+    * robust_scm2double (me->get_property ("thickness"), 1);
+  Real line_thick = staff_thick
+    * robust_scm2double (me->get_property ("line-thickness"), 1);
+
   Bezier one = get_curve (me);
   Stencil a;
 
@@ -94,12 +99,12 @@ Slur::print (SCM smob)
   SCM p = me->get_property ("dash-period");
   SCM f = me->get_property ("dash-fraction");
   if (scm_is_number (p) && scm_is_number (f))
-    a = Lookup::dashed_slur (one, thick, robust_scm2double (p, 1.0),
+    a = Lookup::dashed_slur (one, line_thick, robust_scm2double (p, 1.0),
                             robust_scm2double (f, 0));
   else
     a = Lookup::slur (one,
-                     get_grob_direction (me) * staff_thick * 1.0,
-                     thick);
+                     get_grob_direction (me) * base_thick,
+                     line_thick);
 
 #if DEBUG_SLUR_SCORING
   SCM quant_score = me->get_property ("quant-score");
@@ -108,9 +113,14 @@ Slur::print (SCM smob)
                  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
       && scm_is_string (quant_score))
     {
-      String str;
+      string str;
       SCM properties = Font_interface::text_font_alist_chain (me);
 
+
+      if (!scm_is_number (me->get_property ("font-size")))
+       properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL),
+                            properties);
+      
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
                                    (me->layout ()->self_scm (), properties,
                                     quant_score));
@@ -204,7 +214,6 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
            : ((fabs (bezext[RIGHT] - x) < EPS)
               ? curve.control_[3][Y_AXIS]
               : curve.get_other_coordinate (X_AXIS, x));
-         consider[k] = true;
 
          /* Request shift if slur is contained script's Y, or if
             script is inside slur and avoid == outside.  */
@@ -215,34 +224,74 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
     }
 
   Real avoidance_offset = 0.0;
-  if (do_shift)
+  for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
+    if (consider[k]) 
+      avoidance_offset = dir * (max (dir * avoidance_offset,
+                                    dir * (ys[k] - yext[-dir] + dir * slur_padding)));
+  
+  return scm_from_double (scm_to_double (offset_scm) + avoidance_offset);
+}
+
+/*
+ * Used by Slur_engraver:: and Phrasing_slur_engraver::
+ */
+void
+Slur::auxiliary_acknowledge_extra_object (Grob_info info,
+  vector<Grob*>& slurs, vector<Grob*>& end_slurs)
+{
+  if (slurs.empty () && end_slurs.empty ())
+    return;
+  
+  Grob *e = info.grob ();
+  SCM avoid = e->get_property ("avoid-slur");
+  if (Tie::has_interface (e)
+      || avoid == ly_symbol2scm ("inside"))
     {
-      for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
-       avoidance_offset = dir * (max (dir * avoidance_offset,
-                            dir * (ys[k] - yext[-dir] + dir * slur_padding)));
+      for (vsize i = slurs.size (); i--;)
+       add_extra_encompass (slurs[i], e);
+      for (vsize i = end_slurs.size (); i--;)
+       add_extra_encompass (end_slurs[i], e);
     }
+  else if (avoid == ly_symbol2scm ("outside")
+          || avoid == ly_symbol2scm ("around"))
+    {
+      Grob *slur;
+      if (end_slurs.size () && !slurs.size ())
+       slur = end_slurs[0];
+      else
+       slur = slurs[0];
 
-  return scm_from_double (scm_to_double (offset_scm) + avoidance_offset);
+      if (slur)
+       {
+         chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS);
+         e->set_object ("slur", slur->self_scm ());
+       }
+    }
+  else
+    e->warning ("Ignoring grob for slur. avoid-slur not set?");
 }
 
 
-
 ADD_INTERFACE (Slur, "slur-interface",
               
               "A slur",
               
               /* properties */
+              "avoid-slur "    /* UGH. */
               "control-points "
               "dash-fraction "
               "dash-period "
+              "details "
               "direction "
               "eccentricity "
               "encompass-objects "
               "height-limit "
+              "line-thickness "
               "note-columns "
               "positions "
               "quant-score "
               "ratio "
-              "details "
-              "thickness ");
+              "thickness "
+
+              );