release: 1.5.19

[lilypond.git] / lily / tuplet-bracket.cc

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index a21a2a4959e49e99644ef5956be601910685bdf5..bac89f1d2572ceb501873540e57128b72bdce353 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -83,7 +83,7 @@ Tuplet_bracket::brew_molecule (SCM smob)
     {
       number_visibility = gh_scm2bool (numb);
     }
-  else if (bracket == ly_symbol2scm ("if-no-beam"))
+  else if (numb == ly_symbol2scm ("if-no-beam"))
     number_visibility = !par_beam;
   
        
@@ -113,7 +113,7 @@ Tuplet_bracket::brew_molecule (SCM smob)
       SCM thick = me->get_grob_property ("thick");
       SCM gap = me->get_grob_property ("number-gap");
          
-      SCM at =gh_list (ly_symbol2scm ("tuplet"),
+      SCM at =scm_list_n (ly_symbol2scm ("tuplet"),
                       gh_double2scm (1.0),
                       gap,
                       gh_double2scm (w),
@@ -254,8 +254,9 @@ Tuplet_bracket::after_line_breaking (SCM smob)
   Real dy, offset;
 
   calc_position_and_height (me,&offset,&dy);
-  
-  me->set_grob_property ("delta-y", gh_double2scm (dy));
+
+  if (!gh_number_p (me->get_grob_property ("delta-y")))
+    me->set_grob_property ("delta-y", gh_double2scm (dy));
 
   me->translate_axis (offset, Y_AXIS);
   return SCM_UNSPECIFIED;
@@ -275,9 +276,9 @@ Tuplet_bracket::get_default_dir (Grob*me)
     }
 
   d = UP ;
-  for (SCM s = me->get_grob_property ("columns"); gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = me->get_grob_property ("columns"); gh_pair_p (s); s = ly_cdr (s))
     {
-      Grob * nc = unsmob_grob (gh_car (s));
+      Grob * nc = unsmob_grob (ly_car (s));
       if (Note_column::dir (nc) < 0) 
        {
          d = DOWN;