Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

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

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index a9df448d62f0d6023582bb3e46dc7f11ad5c6fd7..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,7 +87,7 @@ 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));
@@ -175,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");