Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 03137d1b12cc6f09af2fcb05ceb51cfd8266e710..49018d8adb1692f4a3913bde223974ad6813a73f 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cstring>
@@ -63,6 +63,10 @@ Volta_bracket_interface::print (SCM smob)
       */
     }
 
+  modify_edge_height (me);
+  if (!me->is_live ())
+    return SCM_EOL;
+  
   Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
                                                      Interval (1.0, 1.0));
   Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
@@ -70,6 +74,8 @@ Volta_bracket_interface::print (SCM smob)
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
                                                  Interval (0, 0));
 
+
+  
   scale_drul (&edge_height, - Real (get_grob_direction (me)));
 
   Interval empty;
@@ -93,7 +99,7 @@ Volta_bracket_interface::print (SCM smob)
       num.align_to (Y_AXIS, UP);
       num.translate_axis (-0.5, Y_AXIS);
       total.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
-                        - 1.0, 0);
+                        - 1.0);
     }
   
   total.translate_axis (left, X_AXIS);
@@ -101,17 +107,13 @@ Volta_bracket_interface::print (SCM smob)
 }
 
 
-MAKE_SCHEME_CALLBACK(Volta_bracket_interface,after_line_breaking, 1);
-SCM
-Volta_bracket_interface::after_line_breaking (SCM smob)
+void
+Volta_bracket_interface::modify_edge_height (Spanner *me)
 {
-  Spanner *me = unsmob_spanner (smob);
   Spanner *orig_span = dynamic_cast<Spanner *> (me->original ());
  
   bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner *)me);
-
   bool broken_last_bracket = orig_span && (orig_span->broken_intos_.back () == (Spanner *)me);
-
   bool no_vertical_start = orig_span && !broken_first_bracket;
   bool no_vertical_end = orig_span && !broken_last_bracket;
 
@@ -144,8 +146,10 @@ Volta_bracket_interface::after_line_breaking (SCM smob)
 
       me->set_property ("edge-height", ly_interval2scm (edge_height));
     }
-  
-  return SCM_UNSPECIFIED;
+
+  if (broken_last_bracket && no_vertical_end && no_vertical_start
+      && !broken_first_bracket)
+    me->suicide ();
 }
 
 void
@@ -162,7 +166,7 @@ Volta_bracket_interface::add_column (Grob *me, Grob *c)
   Side_position_interface::add_support (me, c);
 }
 
-ADD_INTERFACE (Volta_bracket_interface, "volta-bracket-interface",
+ADD_INTERFACE (Volta_bracket_interface,
               "Volta bracket with number",
 
               /* properties */