release: 0.0.46.jcn1

[lilypond.git] / lily / staffline.cc

diff --git a/lily/staffline.cc b/lily/staffline.cc
index a0ac8a6f99d27aba974d6d9d115ad6575e76c419..742cee60c2653398a9090e4609a6e68440c3803e 100644 (file)
--- a/lily/staffline.cc
+++ b/lily/staffline.cc
@@ -11,7 +11,9 @@
 static String
 make_vbox(Interval i)
 {
-    Real r = (i.empty()) ? 0.0 : i.length();
+    if (i.empty_b()) 
+       i = Interval(0,0);
+    Real r = i.length();
     String s("\\vbox to ");
     s += print_dimen(r);
     s += "{\\vskip "+print_dimen(i.right)+" ";
@@ -64,8 +66,8 @@ Line_of_staff::Line_of_staff(Line_of_score * sc, PStaff*st)
     PCol *linestop = sc->cols.bottom();
     
     for (iter_top(pstaff_l_->spans,i); i.ok(); i++) {
-       PCol *brokenstart = &max(*linestart, *i->left);
-       PCol *brokenstop = &min(*linestop, *i->right);
+       PCol *brokenstart = &max(*linestart, *i->left_col_l_);
+       PCol *brokenstop = &min(*linestop, *i->right_col_l_);
        if ( *brokenstart < *brokenstop) {
            Spanner*span_p =i->broken_at(brokenstart,brokenstop);
            line_of_score_l_->pscore_l_-> // higghl