(ly:optimal-page-breaks): Bugfix: underful

[lilypond.git] / lily / mensural-ligature.cc

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 0866707bd188dac9e2d0dca82eef7a28ef137d7c..f7b6927f28bc86ddfab0fa4df39c925dfdea1619 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -54,7 +54,7 @@ brew_flexa (Grob *me,
       Real y_correction =
        (cauda_direction == UP) ?
        +0.5*height :
-       -0.5*height - cauda_box_y.length();
+       -0.5*height - cauda_box_y.length ();
 
       Box cauda_box (cauda_box_x, cauda_box_y);
       Stencil cauda = Lookup::filled_box (cauda_box);
@@ -66,8 +66,8 @@ brew_flexa (Grob *me,
 
   // Compensate optical illusion regarding vertical position of left
   // and right endings due to slope.
-  Real ypos_correction = -0.1*staff_space * sign(slope);
-  Real slope_correction = 0.2*staff_space * sign(slope);
+  Real ypos_correction = -0.1*staff_space * sign (slope);
+  Real slope_correction = 0.2*staff_space * sign (slope);
   Real corrected_slope = slope + slope_correction/width;
 
   if (solid)
@@ -80,13 +80,13 @@ brew_flexa (Grob *me,
     {
       Stencil left_edge =
        Lookup::beam (corrected_slope, thickness, height, 0.0);
-      stencil.add_stencil(left_edge);
+      stencil.add_stencil (left_edge);
 
       Stencil right_edge =
        Lookup::beam (corrected_slope, thickness, height, 0.0);
       right_edge.translate_axis (width-thickness, X_AXIS);
       right_edge.translate_axis (corrected_slope * (width-thickness), Y_AXIS);
-      stencil.add_stencil(right_edge);
+      stencil.add_stencil (right_edge);
 
       Stencil bottom_edge =
        Lookup::beam (corrected_slope, width, thickness, 0.0);
@@ -127,7 +127,7 @@ add_ledger_lines (Grob *me, Stencil *out, int pos, Real offs,
 Stencil
 internal_brew_primitive (Grob *me, bool ledger_take_space)
 {
-  SCM primitive_scm = me->get_grob_property ("primitive");
+  SCM primitive_scm = me->get_property ("primitive");
   if (primitive_scm == SCM_EOL)
     {
       programming_error ("Mensural_ligature:"
@@ -143,21 +143,21 @@ internal_brew_primitive (Grob *me, bool ledger_take_space)
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   if (primitive & MLP_ANY)
     {
-      thickness = robust_scm2double ( me->get_grob_property ("thickness"), .14);
+      thickness = robust_scm2double ( me->get_property ("thickness"), .14);
     }
 
   if (primitive & MLP_FLEXA)
     {
-      delta_pitch = robust_scm2int (me->get_grob_property ("delta-pitch"),
+      delta_pitch = robust_scm2int (me->get_property ("delta-pitch"),
                                    0);
 
-      flexa_width = robust_scm2double (me->get_grob_property ("flexa-width"), 2.0 * staff_space);
+      flexa_width = robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
     }
 
   switch (primitive)
     {
       case MLP_NONE:
-       return Stencil();
+       return Stencil ();
       case MLP_BB:
        out = brew_flexa (me, delta_pitch, false,
                          flexa_width, thickness, true, DOWN);
@@ -185,7 +185,7 @@ internal_brew_primitive (Grob *me, bool ledger_take_space)
        return Stencil ();
     }
 
-  SCM join_left_scm = me->get_grob_property ("join-left-amount");
+  SCM join_left_scm = me->get_property ("join-left-amount");
   if (join_left_scm != SCM_EOL)
     {
       int join_left = gh_scm2int (join_left_scm);
@@ -203,11 +203,11 @@ internal_brew_primitive (Grob *me, bool ledger_take_space)
     }
 
   int pos = (int)rint (Staff_symbol_referencer::get_position (me));
-  add_ledger_lines(me, &out, pos, 0, ledger_take_space);
+  add_ledger_lines (me, &out, pos, 0, ledger_take_space);
   if (primitive & MLP_FLEXA)
     {
       pos += delta_pitch;
-      add_ledger_lines(me, &out, pos, 0.5*delta_pitch, ledger_take_space);
+      add_ledger_lines (me, &out, pos, 0.5*delta_pitch, ledger_take_space);
     }
 
   return out;