Run grand-replace (issue 3765)

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 9f12df878c20099e56b426d8d5b8263b33b6a990..7d2ca978c7afb1d46064136dcad85260eeb2e551 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -48,14 +48,7 @@ SCM
 Slur::calc_direction (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  vector<Grob *> encompasses;
-  extract_grob_set (me, "note-columns", ro_encompasses);
-  encompasses.insert (encompasses.end (), ro_encompasses.begin (), ro_encompasses.end ());
-  if (Grob *other_half = unsmob_grob (me->get_object ("other-half")))
-    {
-      extract_grob_set (other_half, "note-columns", oh_encompasses);
-      encompasses.insert (encompasses.end (), oh_encompasses.begin (), oh_encompasses.end ());
-    }
+  extract_grob_set (me, "note-columns", encompasses);
 
   if (encompasses.empty ())
     {
@@ -549,6 +542,12 @@ ADD_INTERFACE (Slur,
                "@item head-slur-distance-max-ratio\n"
                "The maximum value for the ratio of distance between a"
                " note head and slur.\n"
+               "@item gap-to-staffline-inside\n"
+               "Minimum gap inside the curve of the slur"
+               " where the slur is parallel to a staffline.\n"
+               "@item gap-to-staffline-outside\n"
+               "Minimum gap outside the curve of the slur"
+               " where the slur is parallel to a staffline.\n"
                "@item free-slur-distance\n"
                "The amount of vertical free space that must exist"
                " between adjacent slurs.  This subproperty only works"