release: 1.5.28

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 33d0ce5757d8af39370401d8b831bb1e586e43ed..15a8b30ea8fb2b453794c9dc25f095366cebda2a 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -48,7 +48,7 @@ Slur::add_column (Grob*me, Grob*n)
     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);
     }
 
@@ -69,9 +69,9 @@ Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height)
       Real f = default_height / length;
       SCM up = me->get_grob_property ("de-uglify-parameters");
       
-      Real c1 = gh_scm2double (gh_car (up));
-      Real c2 = gh_scm2double (gh_cadr (up));
-      Real c3 = gh_scm2double (gh_caddr (up)); 
+      Real c1 = gh_scm2double (ly_car (up));
+      Real c2 = gh_scm2double (ly_cadr (up));
+      Real c3 = gh_scm2double (ly_caddr (up)); 
       
       if (h > c1 * f)
        {
@@ -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 ++) 
@@ -175,17 +175,27 @@ Slur::set_extremities (Grob *me)
   Direction dir = LEFT;
   do 
     {
-      if (!gh_symbol_p (index_cell (me->get_grob_property ("attachment"), dir)))
+      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);
+       }
+      
+      if (!gh_symbol_p (index_cell (att, dir)))
        {
          for (SCM s = me->get_grob_property ("extremity-rules");
-              s != SCM_EOL; s = gh_cdr (s))
+              s != SCM_EOL; s = ly_cdr (s))
            {
-             SCM r = gh_call2 (gh_caar (s), me->self_scm (),
+             SCM r = gh_call2 (ly_caar (s), me->self_scm (),
                                 gh_int2scm ((int)dir));
              if (r != SCM_BOOL_F)
                {
-                 index_set_cell (me->get_grob_property ("attachment"), dir,
-                                 gh_cdar (s));
+                 index_set_cell (att, dir,
+                                 ly_cdar (s));
                  break;
                }
            }
@@ -201,10 +211,10 @@ Real
 Slur::get_first_notecolumn_y (Grob *me, Direction dir)
 {
   Grob *col = dir == LEFT
-    ? unsmob_grob (gh_car (scm_reverse (me->get_grob_property
+    ? unsmob_grob (ly_car (scm_reverse (me->get_grob_property
  ("note-columns"))))
     : unsmob_grob
- (gh_car (me->get_grob_property ("note-columns")));
+ (ly_car (me->get_grob_property ("note-columns")));
   
   Grob *common[] =
   {
@@ -267,7 +277,7 @@ Slur::get_attachment (Grob *me, Direction dir,
       set_extremities (me);
       s = me->get_grob_property ("attachment");
     }
-  SCM a = dir == LEFT ? gh_car (s) : gh_cdr (s);
+  SCM a = dir == LEFT ? ly_car (s) : ly_cdr (s);
   Spanner*sp = dynamic_cast<Spanner*> (me);
   String str = ly_symbol2string (a);
   Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
@@ -327,7 +337,7 @@ Slur::get_attachment (Grob *me, Direction dir,
     Hmm, maybe after-line-breaking should set this to loose-end?  */
   else // if (str == "loose-end")
     {
-      SCM other_a = dir == LEFT ? gh_cdr (s) : gh_car (s);
+      SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s);
       if (ly_symbol2string (other_a) != "loose-end")
        o = broken_trend_offset (me, dir);
     }
@@ -336,14 +346,14 @@ Slur::get_attachment (Grob *me, Direction dir,
   int stemdir = stem ? Stem::get_direction (stem) : 1;
   int slurdir = gh_scm2int (me->get_grob_property ("direction"));
   SCM l = scm_assoc
-    (scm_listify (a,
+    (scm_list_n (a,
                  gh_int2scm (stemdir * dir),
                  gh_int2scm (slurdir * dir),
                   SCM_UNDEFINED), alist);
 
   if (l != SCM_BOOL_F)
     {
-      Offset off = ly_scm2offset (gh_cdr (l)) * staff_space;
+      Offset off = ly_scm2offset (ly_cdr (l)) * staff_space;
       off[X_AXIS] *= dir;
       off[Y_AXIS] *= Directional_element_interface::get (me);
       o += off;
@@ -431,8 +441,8 @@ Slur::get_encompass_offset_arr (Grob *me)
   Link_array<Grob>  encompass_arr;
   while (gh_pair_p (eltlist))
     {
-      encompass_arr.push (unsmob_grob (gh_car (eltlist)));      
-      eltlist =gh_cdr (eltlist);
+      encompass_arr.push (unsmob_grob (ly_car (eltlist)));      
+      eltlist =ly_cdr (eltlist);
     }
   encompass_arr.reverse ();
 
@@ -545,8 +555,8 @@ Slur::set_control_points (Grob*me)
   SCM h_inf_scm = scm_assq (ly_symbol2scm ("height-limit"), details);
   SCM r_0_scm = scm_assq (ly_symbol2scm ("ratio"), details);
 
-  Real r_0 = gh_scm2double (gh_cdr (r_0_scm));
-  Real h_inf = staff_space * gh_scm2double (gh_cdr (h_inf_scm));
+  Real r_0 = gh_scm2double (ly_cdr (r_0_scm));
+  Real h_inf = staff_space * gh_scm2double (ly_cdr (h_inf_scm));
   
   Slur_bezier_bow bb (get_encompass_offset_arr (me),
                      Directional_element_interface::get (me),
@@ -565,8 +575,8 @@ Slur::set_control_points (Grob*me)
       bb.minimise_enclosed_area (sb, details);
       SCM sbf = scm_assq (ly_symbol2scm ("force-blowfit"), details);
       Real bff = 1.0;
-      if (gh_pair_p (sbf) && gh_number_p (gh_cdr (sbf)))
-         bff = gh_scm2double (gh_cdr (sbf));
+      if (gh_pair_p (sbf) && gh_number_p (ly_cdr (sbf)))
+         bff = gh_scm2double (ly_cdr (sbf));
 
       bb.curve_.control_[1][Y_AXIS] *= bff;
       bb.curve_.control_[2][Y_AXIS] *= bff;
@@ -622,9 +632,9 @@ Slur::get_curve (Grob*me)
   if (!scm_ilength (me->get_grob_property ("note-columns")))
     return b;
 
-  for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = gh_cdr (s))
+  for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = ly_cdr (s))
     {
-      b.control_[i] = ly_scm2offset (gh_car (s));
+      b.control_[i] = ly_scm2offset (ly_car (s));
       i++;
     }