release: 1.3.90

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index c0b3e4b9e4295a0e24072f6c3b1a944de8101fcc..a55a77812fe7869426af5efbfb09cb0d22d6adfa 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -133,12 +133,7 @@ Slur::set_extremities (Score_element*me)
     {
       if (!gh_symbol_p (index_cell (me->get_elt_property ("attachment"), dir)))
        {
-         
-         // for (SCM s = get_elt_property ("slur-extremity-rules"); s != SCM_EOL; s = gh_cdr (s))
-
-         // FIXME: global GUILE scope used!
-         for (SCM s = scm_eval2 (ly_symbol2scm ("slur-extremity-rules"),
-                                 SCM_EOL);
+         for (SCM s = me->get_elt_property ("extremity-rules");
               s != SCM_EOL; s = gh_cdr (s))
            {
              SCM r = gh_call2 (gh_caar (s), me->self_scm (),
@@ -289,17 +284,15 @@ Slur::get_attachment (Score_element*me,Direction dir,
        
     }
 
-
-  // FIXME
-  int stemdir = stem ? Stem::get_direction (stem) : 1;
+  SCM alist = me->get_elt_property ("extremity-offset-alist");
+int stemdir = stem ? Stem::get_direction (stem) : 1;
   int slurdir = gh_scm2int (me->get_elt_property ("direction"));
   SCM l = scm_assoc
-    (scm_listify (a,
-                 gh_int2scm (stemdir * dir),
-                 gh_int2scm (slurdir * dir),
-                 SCM_UNDEFINED),
-     scm_eval2 (ly_symbol2scm ("slur-extremity-offset-alist"), SCM_EOL));
-  
+      (scm_listify (a,
+                gh_int2scm (stemdir * dir),
+                gh_int2scm (slurdir * dir),
+                  SCM_UNDEFINED), alist);
+
   if (l != SCM_BOOL_F)
     {
       o += ly_scm2offset (gh_cdr (l)) * ss * dir;