X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmelody-spanner.cc;h=3550e8938240d13abd1b4f1ff76a0bb2d9f6916e;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=03cf1370952e8abde3fdf1d96c168d35960374b8;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/melody-spanner.cc b/lily/melody-spanner.cc
index 03cf137095..3550e89382 100644
--- a/lily/melody-spanner.cc
+++ b/lily/melody-spanner.cc
@@ -1,10 +1,21 @@
 /*
-  melody-spanner.cc -- implement Melody_spanner
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "melody-spanner.hh"
@@ -16,69 +27,71 @@
   let's take item for now.
 */
 
-		 
 /*
   Interpolate stem directions for neutral stems.
  */
-MAKE_SCHEME_CALLBACK(Melody_spanner,calc_neutral_stem_direction, 1);
+MAKE_SCHEME_CALLBACK (Melody_spanner, calc_neutral_stem_direction, 1);
 SCM
 Melody_spanner::calc_neutral_stem_direction (SCM smob)
 {
-  Grob *stem = unsmob_grob (smob);
-  Grob *me =  unsmob_grob (stem->get_object ("melody-spanner"));
+  Grob *stem = unsmob<Grob> (smob);
+  Grob *me = unsmob<Grob> (stem->get_object ("melody-spanner"));
   if (!me || !me->is_live ())
-    return SCM_UNSPECIFIED;
-  
+    return scm_from_int (DOWN);
+
   extract_grob_set (me, "stems", stems);
 
-  Array<Direction> dirs;
-  for (int i = 0; i < stems.size (); i++)
-    {
-      dirs.push (to_dir (stems[i]->get_property ("default-direction")));
-    }
+  vector<Direction> dirs;
+  for (vsize i = 0; i < stems.size (); i++)
+    dirs.push_back (to_dir (stems[i]->get_property ("default-direction")));
 
-  int last_nonneutral = -1;
-  int next_nonneutral = 0;
-  while (next_nonneutral < dirs.size() &&  !dirs[next_nonneutral])
-    next_nonneutral ++;
+  vsize last_nonneutral = VPOS;
+  vsize next_nonneutral = 0;
+  while (next_nonneutral != VPOS && next_nonneutral < dirs.size ()
+         && !dirs[next_nonneutral])
+    next_nonneutral++;
 
-  while (last_nonneutral < dirs.size () - 1) 
+  SCM retval = SCM_EOL;
+  while (last_nonneutral == VPOS || last_nonneutral + 1 < dirs.size ())
     {
       Direction d1 = CENTER;
       Direction d2 = CENTER;
-      if (last_nonneutral >= 0)
-	d1 = dirs[last_nonneutral];
+      if (last_nonneutral != VPOS)
+        d1 = dirs[last_nonneutral];
       if (next_nonneutral < dirs.size ())
-	d2 = dirs[next_nonneutral];
+        d2 = dirs[next_nonneutral];
 
       Direction total = CENTER;
       if (d1 && d1 == d2)
-	total = d1;
+        total = d1;
       else if (d1 && !d2)
-	total = d1;
+        total = d1;
       else if (d2 && !d1)
-	total = d2;
+        total = d2;
       else
-	total = to_dir (me->get_property ("neutral-direction"));
-      
-      for (int i = last_nonneutral + 1; i <  next_nonneutral; i++)
-	stems[i]->set_property ("neutral-direction", scm_from_int (total));
+        total = to_dir (me->get_property ("neutral-direction"));
 
+      for (vsize i = last_nonneutral + 1; i < next_nonneutral; i++)
+        {
+          if (stems[i] == stem)
+            retval = scm_from_int (total);
+          else
+            stems[i]->set_property ("neutral-direction", scm_from_int (total));
+        }
 
       last_nonneutral = next_nonneutral;
       while (last_nonneutral < dirs.size ()
-	     && dirs[last_nonneutral])
-	last_nonneutral ++;
+             && dirs[last_nonneutral])
+        last_nonneutral++;
       next_nonneutral = last_nonneutral;
-      last_nonneutral --;
+      last_nonneutral--;
 
       while (next_nonneutral < dirs.size ()
-	     && !dirs[next_nonneutral])
-	next_nonneutral ++;
+             && !dirs[next_nonneutral])
+        next_nonneutral++;
     }
 
-  me->suicide ();
-  return SCM_UNSPECIFIED;
+  return retval;
 }
 
 void
@@ -89,10 +102,11 @@ Melody_spanner::add_stem (Grob *me, Grob *stem)
   stem->set_property ("neutral-direction", Melody_spanner::calc_neutral_stem_direction_proc);
 }
 
-ADD_INTERFACE (Melody_spanner, "melody-spanner-interface",
-	       "Context dependent typesetting decisions.",
+ADD_INTERFACE (Melody_spanner,
+               "Context dependent typesetting decisions.",
 
-	       "stems "
-	       "neutral-direction ");
+               /* properties */
+               "stems "
+               "neutral-direction "
+              );
 
-