Merge remote-tracking branch 'origin/release/unstable' into HEAD

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 40e165dd6d0ffe35c9cfff0051e19133129037ed..01d8fd93dea61f696d5af6a189244517f4fca622 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -38,7 +38,7 @@ MAKE_SCHEME_CALLBACK (Hairpin, pure_height, 3);
 SCM
 Hairpin::pure_height (SCM smob, SCM, SCM)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Real height = robust_scm2double (me->get_property ("height"), 0.0)
                 * Staff_symbol_referencer::staff_space (me);
 
@@ -53,7 +53,7 @@ MAKE_SCHEME_CALLBACK (Hairpin, broken_bound_padding, 1);
 SCM
 Hairpin::broken_bound_padding (SCM smob)
 {
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = unsmob<Spanner> (smob);
   Item *r_bound = me->get_bound (RIGHT);
   if (r_bound->break_status_dir () != -1)
     {
@@ -88,7 +88,7 @@ Hairpin::broken_bound_padding (SCM smob)
             if (!scm_is_pair (hsb))
               break;
 
-            span_bars[d] = unsmob_grob ((d == UP ? scm_car : scm_cdr) (hsb));
+            span_bars[d] = unsmob<Grob> ((d == UP ? scm_car : scm_cdr) (hsb));
             break;
           }
 
@@ -107,7 +107,7 @@ MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
 SCM
 Hairpin::print (SCM smob)
 {
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = unsmob<Spanner> (smob);
 
   SCM s = me->get_property ("grow-direction");
   if (!is_direction (s))
@@ -185,7 +185,7 @@ Hairpin::print (SCM smob)
         }
       else
         {
-          if (Text_interface::has_interface (b))
+          if (has_interface<Text_interface> (b))
             {
               if (!e.is_empty ())
                 x_points[d] = e[-d] - d * padding;
@@ -214,7 +214,7 @@ Hairpin::print (SCM smob)
 
               if (neighbor_found)
                 {
-                  if (Hairpin::has_interface (adjacent))
+                  if (has_interface<Hairpin> (adjacent))
                     {
                       /*
                         Handle back-to-back hairpins with a circle in the middle
@@ -236,7 +236,8 @@ Hairpin::print (SCM smob)
                 }
               else
                 {
-                  if (Note_column::has_interface (b)
+                  if (d == RIGHT // end at the left edge of a rest
+                      && has_interface<Note_column> (b)
                       && Note_column::has_rests (b))
                     x_points[d] = e[-d];
                   else