lilypond-1.3.44

diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely
index 05bc8056b935f48082f6ae6c4a442cda8fbfe20a..20924c7e9669d7f8c4c7f0e96492eb06674e7eb7 100644 (file)
--- a/Documentation/user/glossary.tely
+++ b/Documentation/user/glossary.tely
@@ -324,8 +324,8 @@ orchestral or choral score.
 @
 
 @mudela[13pt,eps] 
-%\context StaffGroup < 
-\context ChoirStaff < 
+\context StaffGroup < 
+% \context ChoirStaff < 
   \property StaffGroup.minVerticalAlign = 12
   \notes\relative c'' { \clef treble; g4 e c2 }
   \notes\relative c { \clef bass; c1 \bar "|."; } > 

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 7b6a4d0f08418474370625103a7180fa8442ec57..9a8ed71038379a4cc4de36abed5e67c7144d7153 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -64,19 +64,22 @@ Spanner::do_break_processing ()
       do
        {
          Item* bound = left->find_broken_piece (d);
-         Spanner * span_p = dynamic_cast<Spanner*>( clone ());
-         span_p->set_bound (LEFT, bound);
-         span_p->set_bound (RIGHT, bound);
+         if (bound->line_l ())
+           {
+             Spanner * span_p = dynamic_cast<Spanner*>( clone ());
+             span_p->set_bound (LEFT, bound);
+             span_p->set_bound (RIGHT, bound);
 
-         assert (span_p->line_l ()); 
-         pscore_l_->typeset_element (span_p);
-         broken_into_l_arr_.push (span_p);
+             assert (span_p->line_l ()); 
+             span_p->line_l ()->typeset_element (span_p);
+             broken_into_l_arr_.push (span_p);
+           }
        }
       while ((flip(&d))!= LEFT);
     }
   else
     {
-      Link_array<Item> break_points = pscore_l_->broken_col_range (left,right);
+      Link_array<Item> break_points = pscore_l_->line_l_->broken_col_range (left,right);
 
       break_points.insert (left,0);
       break_points.push (right);
@@ -100,8 +103,12 @@ Spanner::do_break_processing ()
          Spanner *span_p = dynamic_cast<Spanner*>(clone ());
          span_p->set_bound(LEFT,bounds[LEFT]);
          span_p->set_bound(RIGHT,bounds[RIGHT]);
-      
-         pscore_l_->typeset_element (span_p);
+
+
+         assert (bounds[LEFT]->line_l () ==
+                 bounds[RIGHT]->line_l ());
+
+         bounds[LEFT]->line_l ()->typeset_element (span_p);
          broken_into_l_arr_.push (span_p);
        }
     }