X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Fslur.cc;h=4cc9bf3e5a6aadc91eadd3b99ee8617d3532df67;hb=94375d04f45b415ad705fd444fdb344416f116d9;hp=f2035877bd5215d2db489a079ea11bcefd4d8d86;hpb=16cacae1942bf83ad3347ffa3fc53af3e9a81055;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index f2035877bd..4cc9bf3e5a 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -70,8 +70,8 @@ Slur::de_uglyfy (Grob*me, Slur_bezier_bow* bb, Real default_height)
       SCM up = me->get_grob_property ("de-uglify-parameters");
       
       Real c1 = gh_scm2double (ly_car (up));
-      Real c2 = gh_scm2double (gh_cadr (up));
-      Real c3 = gh_scm2double (gh_caddr (up)); 
+      Real c2 = gh_scm2double (ly_cadr (up));
+      Real c3 = gh_scm2double (ly_caddr (up)); 
       
       if (h > c1 * f)
 	{
@@ -180,12 +180,12 @@ Slur::set_extremities (Grob *me)
 	  for (SCM s = me->get_grob_property ("extremity-rules");
 	       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));
+				  ly_cdar (s));
 		  break;
 		}
 	    }