release: 1.5.44

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 4cc9bf3e5a6aadc91eadd3b99ee8617d3532df67..427cd0799acaae8552d332d0478fac6d90a73228 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -45,10 +45,10 @@ void
 Slur::add_column (Grob*me, Grob*n)
 {
   if (!gh_pair_p (n->get_grob_property ("note-heads")))
-    warning (_ ("Putting slur over rest.  Ignoring."));
+    me->warning (_ ("Putting slur over rest.  Ignoring."));
   else
     {
-      Pointer_group_interface::add_element (me, "note-columns",n);
+      Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n);
       me->add_dependency (n);
     }
 
@@ -92,7 +92,7 @@ Direction
 Slur::get_default_dir (Grob*me) 
 {
   Link_array<Grob> encompass_arr =
-    Pointer_group_interface__extract_elements (me, (Grob*)0, "note-columns");
+    Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
   
   Direction d = DOWN;
   for (int i=0; i < encompass_arr.size (); i ++) 
@@ -166,16 +166,30 @@ Slur::check_slope (Grob *me)
     }
 }
 
-void
+/*
+  Set 'attachment grob property, and return it.
+*/
+SCM
 Slur::set_extremities (Grob *me)
 {
   if (!Directional_element_interface::get (me))
     Directional_element_interface::set (me, get_default_dir (me));
 
+  SCM att = me->get_grob_property ("attachment");
+      /*
+       */
+      if (!gh_pair_p (att))
+       {
+         programming_error ("attachment is not a cons?!");
+         att = gh_cons (SCM_EOL, SCM_EOL);
+         me->set_grob_property ("attachment", att);
+       }
+      
   Direction dir = LEFT;
   do 
     {
-      if (!gh_symbol_p (index_cell (me->get_grob_property ("attachment"), dir)))
+    
+      if (!gh_symbol_p (index_cell (att, dir)))
        {
          for (SCM s = me->get_grob_property ("extremity-rules");
               s != SCM_EOL; s = ly_cdr (s))
@@ -184,7 +198,7 @@ Slur::set_extremities (Grob *me)
                                 gh_int2scm ((int)dir));
              if (r != SCM_BOOL_F)
                {
-                 index_set_cell (me->get_grob_property ("attachment"), dir,
+                 index_set_cell (att, dir,
                                  ly_cdar (s));
                  break;
                }
@@ -194,6 +208,8 @@ Slur::set_extremities (Grob *me)
   while (flip (&dir) != LEFT);
 
   check_slope (me);
+
+  return att;
 }
 
 
@@ -264,9 +280,9 @@ Slur::get_attachment (Grob *me, Direction dir,
   SCM s = me->get_grob_property ("attachment");
   if (!gh_symbol_p (index_cell (s, dir)))
     {
-      set_extremities (me);
-      s = me->get_grob_property ("attachment");
+      s = set_extremities (me);
     }
+  
   SCM a = dir == LEFT ? ly_car (s) : ly_cdr (s);
   Spanner*sp = dynamic_cast<Spanner*> (me);
   String str = ly_symbol2string (a);
@@ -274,6 +290,8 @@ Slur::get_attachment (Grob *me, Direction dir,
   Real hs = staff_space / 2.0;
   Offset o;
   
+  int slurdir = gh_scm2int (me->get_grob_property ("direction"));
+  
   Grob *stem = 0;
   if (Note_column::has_interface (sp->get_bound (dir)))
     {
@@ -313,8 +331,13 @@ Slur::get_attachment (Grob *me, Direction dir,
              /*
                Default position is on stem X, at stem end Y
               */
+             Real stem_thickness =
+               gh_scm2double (stem->get_grob_property ("thickness"))
+               * stem->paper_l ()->get_var ("stafflinethickness");
              o += Offset (0.5 *
-                          x_extent * (1 + Stem::get_direction (stem)),
+                          x_extent * (1 + Stem::get_direction (stem))
+                          - ((dir + 1)/2) * stem_thickness
+                          + ((1 - slurdir)/2) * stem_thickness,
                           0);
            }
        }
@@ -334,7 +357,6 @@ Slur::get_attachment (Grob *me, Direction dir,
 
   SCM alist = me->get_grob_property ("extremity-offset-alist");
   int stemdir = stem ? Stem::get_direction (stem) : 1;
-  int slurdir = gh_scm2int (me->get_grob_property ("direction"));
   SCM l = scm_assoc
     (scm_list_n (a,
                  gh_int2scm (stemdir * dir),
@@ -380,7 +402,7 @@ Slur::encompass_offset (Grob*me,
   
   if (!stem_l)
     {
-      warning (_ ("Slur over rest?"));
+      me->warning (_ ("Slur over rest?"));
       o[X_AXIS] = col->relative_coordinate (common[X_AXIS], X_AXIS);
       o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS);
       return o;  
@@ -610,9 +632,14 @@ Slur::get_curve (Grob*me)
   Bezier b;
   int i = 0;
 
+  SCM attach = me->get_grob_property ("attachment");
+  if (!gh_pair_p (attach))
+    attach = set_extremities(me);
+
+  
   if (!Directional_element_interface::get (me)
-      || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), LEFT))
-      || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), RIGHT)))
+      || ! gh_symbol_p (index_cell (attach, LEFT))
+      || ! gh_symbol_p (index_cell (attach, RIGHT)))
     set_extremities (me);
   
   if (!gh_pair_p (me->get_grob_property ("control-points")))