Imported Upstream version 2.16.0

[lilypond.git] / lily / volta-bracket.cc

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 6877a1a2eb05f7046eb04bf55b34652760524788..317b47ee8d54e9e91f1cd31135c96aa1d0ca9816 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -49,8 +49,8 @@ Volta_bracket_interface::print (SCM smob)
   Spanner *me = unsmob_spanner (smob);
   Spanner *orig_span = dynamic_cast<Spanner *> (me->original ());
   bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0]
-                                           == (Spanner *)me);
-  
+                                            == (Spanner *)me);
+
   Output_def *layout = me->layout ();
   Real half_space = 0.5;
 
@@ -65,67 +65,64 @@ Volta_bracket_interface::print (SCM smob)
     {
       Paper_column *pc = bound->get_column ();
       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);
+             // 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
     {
       /*
-       the volta spanner is attached to the bar-line, which is moved
-       to the right. We don't need to compensate for the left edge.
+        the volta spanner is attached to the bar-line, which is moved
+        to the right. We don't need to compensate for the left edge.
       */
     }
 
   modify_edge_height (me);
   if (!me->is_live ())
     return SCM_EOL;
-  
+
   Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
-                                                     Interval (1.0, 1.0));
+                                                      Interval (1.0, 1.0));
   Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
-                                               Interval (0, 0));
+                                                Interval (0, 0));
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
-                                                 Interval (0, 0));
+                                                  Interval (0, 0));
 
-
-  
   scale_drul (&edge_height, - Real (get_grob_direction (me)));
 
   Interval empty;
   Offset start;
   start[X_AXIS] = me->spanner_length () - left - half_space;
-  
+
   /*
-    ugh, Tuplet_bracket should use Horizontal_bracket, not the other way around. 
+    ugh, Tuplet_bracket should use Horizontal_bracket, not the other way around.
   */
   Stencil total
-    = Tuplet_bracket::make_bracket (me, Y_AXIS, start, 
-                                   edge_height, empty, flare, shorten);
+    = Tuplet_bracket::make_bracket (me, Y_AXIS, start,
+                                    edge_height, empty, flare, shorten);
 
   if (!orig_span || broken_first_bracket)
     {
       SCM text = me->get_property ("text");
       SCM properties = me->get_property_alist_chain (SCM_EOL);
       SCM snum = Text_interface::interpret_markup (layout->self_scm (),
-                                                  properties, text);
+                                                   properties, text);
       Stencil num = *unsmob_stencil (snum);
       num.align_to (Y_AXIS, UP);
       num.translate_axis (-0.5, Y_AXIS);
       total.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
-                        - 1.0);
+                         - 1.0);
     }
-  
+
   total.translate_axis (left, X_AXIS);
   return total.smobbed_copy ();
 }
 
-
 void
 Volta_bracket_interface::modify_edge_height (Spanner *me)
 {
   Spanner *orig_span = dynamic_cast<Spanner *> (me->original ());
- 
+
   bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner *)me);
   bool broken_last_bracket = orig_span && (orig_span->broken_intos_.back () == (Spanner *)me);
   bool no_vertical_start = orig_span && !broken_first_bracket;
@@ -142,23 +139,23 @@ Volta_bracket_interface::modify_edge_height (Spanner *me)
     str = "|";
 
   no_vertical_end
-    |= (str != ":|"
-       && str != "|:"
-       && str != "|."
-       && str != ":|:"
-       && str != ":|.|:"
-       && str != ":|.:"
-       && str != ".|");
+  |= (str != ":|"
+      && str != "|:"
+      && str != "|."
+      && str != ":|:"
+      && str != ":|.|:"
+      && str != ":|.:"
+      && str != ".|");
 
   if (no_vertical_end || no_vertical_start)
     {
       Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
-                                                         Interval (1.0, 1.0));
+                                                          Interval (1.0, 1.0));
       if (no_vertical_start)
-       edge_height[LEFT] = 0.0;
+        edge_height[LEFT] = 0.0;
 
       if (no_vertical_end)
-       edge_height[RIGHT] = 0.0;
+        edge_height[RIGHT] = 0.0;
 
       me->set_property ("edge-height", ly_interval2scm (edge_height));
     }
@@ -176,11 +173,11 @@ Volta_bracket_interface::add_bar (Grob *me, Item *b)
 }
 
 ADD_INTERFACE (Volta_bracket_interface,
-              "Volta bracket with number.",
+               "Volta bracket with number.",
 
-              /* properties */
-              "bars "
-              "thickness "
-              "height "
-              );
+               /* properties */
+               "bars "
+               "thickness "
+               "height "
+              );