patch by Joe Neeman: "I have

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 1672032d40a672810645494410523c533813230c..94e13fe027a1b0ac450162e8942187924fb5b615 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -38,14 +38,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 +64,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 +77,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 +98,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 +112,11 @@ 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);
 
+      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));
@@ -152,14 +158,15 @@ SCM
 Slur::outside_slur_callback (SCM grob, SCM offset_scm)
 {
   Grob *script = unsmob_grob (grob);
-  Grob *slur = unsmob_grob (script->get_object ("slur"));
+  Grob *slur = unsmob_grob (script->get_object ("slur")); 
 
   if (!slur)
     return offset_scm;
 
   SCM avoid = script->get_property ("avoid-slur");
-  if (avoid != ly_symbol2scm ("outside"))
-    return scm_from_int (0);
+  if (avoid != ly_symbol2scm ("outside")
+      && avoid != ly_symbol2scm ("around"))
+    return offset_scm;
   
   Direction dir = get_grob_direction (script);
   if (dir == CENTER)
@@ -208,7 +215,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
          /* Request shift if slur is contained script's Y, or if
             script is inside slur and avoid == outside.  */
          if (yext.contains (ys[k])
-             || dir * ys[k] > dir * yext[-dir])
+             || (dir * ys[k] > dir * yext[-dir] && avoid == ly_symbol2scm ("outside")))
            do_shift = true;
        }
     }
@@ -231,17 +238,21 @@ 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 "
+
+              );