X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-bracket.cc;h=f34afd16951c07d0136e82182407da3ce78b0770;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7def9bf96cf9887297de6432997f3a7e7acab80c;hpb=5bbfc22fce036b9b69df5e420de93e11da23c05e;p=lilypond.git

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index 7def9bf96c..f34afd1695 100644
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -119,6 +119,8 @@ Ottava_bracket::print (SCM smob)
 
       else
         span_points[d] = ext[d];
+
+      span_points[d] -= d * shorten[d];
     }
 
   /*
@@ -155,21 +157,19 @@ Ottava_bracket::print (SCM smob)
                                       Y_AXIS, Offset (bracket_span_points.length (), 0),
                                       edge_height,
                                       empty,
-                                      flare, shorten);
+                                      flare, Drul_array<Real> (0, 0));
 
   /*
-    The vertical lines should not take space, for the following scenario:
-
-    8 -----+
-    o  |
-    |
-    |
-
-
-    Just a small amount, yes.  In tight situations, it is even
-    possible to center the `8' directly below the note, dropping the
-    ottava line completely...
-
+   * The vertical lines should not take space, for the following scenario:
+   *
+   * 8 -----+
+   *     o  |
+   *    |
+   *    |
+   *
+   * Just a small amount, yes.  In tight situations, it is even
+   * possible to center the `8' directly below the note, dropping the
+   * ottava line completely...
   */
 
   b = Stencil (Box (b.extent (X_AXIS),