]> git.donarmstrong.com Git - lilypond.git/commitdiff
Fix 1545.
authorJoe Neeman <joeneeman@gmail.com>
Thu, 3 Mar 2011 01:29:42 +0000 (12:29 +1100)
committerJoe Neeman <joeneeman@gmail.com>
Thu, 3 Mar 2011 01:29:42 +0000 (12:29 +1100)
Use the width of the BreakAlignment, not the width of the PaperColumn,
for determining the start-point of a volta bracket.

lily/volta-bracket.cc

index c135e525682b877a77b4b4fa826fbeaa7d3407db..6877a1a2eb05f7046eb04bf55b34652760524788 100644 (file)
@@ -57,14 +57,17 @@ Volta_bracket_interface::print (SCM smob)
   Item *bound = dynamic_cast<Spanner *> (me)->get_bound (LEFT);
 
   /*
-    not a start, but really broken in two
+    If the volta bracket appears after a line-break, make
+    it start after the prefatory matter.
   */
   Real left = 0.;
   if (bound->break_status_dir () == RIGHT)
     {
       Paper_column *pc = bound->get_column ();
-      left = pc->extent (pc, X_AXIS)[RIGHT]
-       - bound->relative_coordinate (pc, X_AXIS);
+      left = pc->break_align_width (pc, ly_symbol2scm ("break-alignment"))[RIGHT]
+       // For some reason, break_align_width is relative to
+       // the x-parent of the column.
+       - bound->relative_coordinate (pc->get_parent (X_AXIS), X_AXIS);
     }
   else
     {