* scripts/lilypond-book.py (process_snippets): Argument fix.

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

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index 80b98d25004ec8fe8f8ebd382253c695cafa2c41..f3b90b124cebbe971131e90fbacef8598bbd6640 100644 (file)
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "text-interface.hh"
@@ -42,7 +42,7 @@ Ottava_bracket::print (SCM smob)
   Interval span_points;
 
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Output_def *layout = me->get_layout ();
+  Output_def *layout = me->layout ();
 
   Drul_array<bool> broken;
   Direction d = LEFT;
@@ -55,7 +55,7 @@ Ottava_bracket::print (SCM smob)
        {
          extract_grob_set (b, "note-heads", heads);
          common = common_refpoint_of_array (heads, common, X_AXIS);
-         for (int i = 0; i < heads.size (); i++)
+         for (vsize i = 0; i < heads.size (); i++)
            {
              Grob *h = heads[i];
              Grob *dots = Rhythmic_head::get_dots (h);
@@ -87,23 +87,19 @@ Ottava_bracket::print (SCM smob)
       if (Note_column::has_interface (b))
        {
          extract_grob_set (b, "note-heads", heads);
-         for (int i = 0; i < heads.size (); i++)
+         for (vsize i = 0; i < heads.size (); i++)
            {
              Grob *h = heads[i];
              ext.unite (h->extent (common, X_AXIS));
              Grob *dots = Rhythmic_head::get_dots (h);
 
              if (dots && d == RIGHT)
-               {
-                 ext.unite (dots->extent (common, X_AXIS));
-               }
+               ext.unite (dots->extent (common, X_AXIS));
            }
        }
 
       if (ext.is_empty ())
-       {
-         ext = robust_relative_extent (b, common, X_AXIS);
-       }
+       ext = robust_relative_extent (b, common, X_AXIS);
 
       if (broken[d])
        {
@@ -122,10 +118,10 @@ Ottava_bracket::print (SCM smob)
   Real text_size = text.extent (X_AXIS).is_empty ()
     ? 0.0 : text.extent (X_AXIS)[RIGHT] + 0.3;
 
-  span_points[LEFT] =
-    min (span_points[LEFT],
-        (span_points[RIGHT] - text_size
-         - robust_scm2double (me->get_property ("minimum-length"), -1.0)));
+  span_points[LEFT]
+    = min (span_points[LEFT],
+          (span_points[RIGHT] - text_size
+           - robust_scm2double (me->get_property ("minimum-length"), -1.0)));
 
   Interval bracket_span_points = span_points;
   bracket_span_points[LEFT] += text_size;
@@ -179,7 +175,16 @@ Ottava_bracket::print (SCM smob)
   return b.smobbed_copy ();
 }
 
-ADD_INTERFACE (Ottava_bracket, "ottava-bracket-interface",
+ADD_INTERFACE (Ottava_bracket,
+              "ottava-bracket-interface",
+              
               "An ottava bracket",
-              "edge-height bracket-flare shorten-pair minimum-length");
+
+              /*
+                properties
+               */
+              "edge-height "
+              "bracket-flare "
+              "shorten-pair "
+              "minimum-length");