(parallel_beam): broken bracket never is

synched to a beam.

diff --git a/ChangeLog b/ChangeLog
index 97ae6c0cd24c69ce543c8c3f73bb948f64d1ea75..4ad6844a11b19d25f2ecc2bfd05d0c9c059fd25c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/tuplet-bracket.cc (parallel_beam): broken bracket never is
+       synched to a beam.
+
        * lily/beam.cc (shift_region_to_valid): divide by zero fix. This
        fixes beams with a single stem (eg. beams across linebreaks.)
 

diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly
index 87a17f8f3506cbaeb55c2312e16d589b70f9e9bb..95fb4cf98c14979b21295a012c4c36321db38424 100644 (file)
--- a/input/regression/tuplet-broken.ly
+++ b/input/regression/tuplet-broken.ly
@@ -21,7 +21,7 @@
 
   \override TupletBracket #'edge-text = #(cons
                                          (markup #:fontsize 6
-                                            #:arrow-head Y LEFT #f)
+                                            #:arrow-head X LEFT #f)
                                          (markup #:arrow-head X RIGHT #f))
   \times 11/19 {
     c4 c4 c4 c4

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index bb55ca2d018b7ac3776cc53b2e4ec3fac8ee8f6d..bc91d17aea1f9ce1f110b7d9d350d8434da38a23 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -62,21 +62,26 @@ get_x_bound_item (Grob *me_grob, Direction hdir, Direction my_dir)
 }
 
 Grob *
-Tuplet_bracket::parallel_beam (Grob *me, Link_array<Grob> const &cols, bool *equally_long)
+Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array<Grob> const &cols, bool *equally_long)
 {
   /*
     ugh: code dup.
   */
+  Spanner *me = dynamic_cast<Spanner *> (me_grob);
+  
+  if (me->get_bound (LEFT)->break_status_dir ()
+      || me->get_bound (RIGHT)->break_status_dir ())
+    return 0;
+  
   Grob *s1 = Note_column::get_stem (cols[0]);
   Grob *s2 = Note_column::get_stem (cols.top ());
 
   Grob *b1 = s1 ? Stem::get_beam (s1) : 0;
   Grob *b2 = s2 ? Stem::get_beam (s2) : 0;
 
-  Spanner *sp = dynamic_cast<Spanner *> (me);
 
   *equally_long = false;
-  if (! (b1 && (b1 == b2) && !sp->is_broken ()))
+  if (! (b1 && (b1 == b2) && !me->is_broken ()))
     return 0;
 
   extract_grob_set (b1, "stems", beam_stems);