X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-bracket.cc;h=3ea133e483570520878b805c5a545bd3c1919244;hb=6313f2575553aefbef5b98742a52b7dbe2d4a2a9;hp=72f05cf59244e0b7cc90e1efd1b9d12ba4251bea;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index 72f05cf592..3ea133e483 100644
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "text-interface.hh"
-#include "line-spanner.hh"
 #include "spanner.hh"
 #include "font-interface.hh"
 #include "dimensions.hh"
@@ -24,7 +23,7 @@
 struct Ottava_bracket
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 
 /*
@@ -42,7 +41,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 +54,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);
@@ -69,8 +68,9 @@ Ottava_bracket::print (SCM smob)
   SCM properties = Font_interface::text_font_alist_chain (me);
   SCM markup = me->get_property ("text");
   Stencil text;
-  if (Text_interface::markup_p (markup))
-    text = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, markup));
+  if (Text_interface::is_markup (markup))
+    text = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (),
+							      properties, markup));
 
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
 						  Interval (0, 0));
@@ -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;
@@ -136,10 +132,13 @@ Ottava_bracket::print (SCM smob)
   Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
 						Interval (0, 0));
 
-  edge_height[LEFT] = 0.0;
-  edge_height[RIGHT] *= -get_grob_direction (me);
-  if (broken[RIGHT])
-    edge_height[RIGHT] = 0.0;
+  do
+    {
+      edge_height[d] *= -get_grob_direction (me);
+      if (broken[d])
+	edge_height[d] = 0.0;
+    }
+  while (flip(&d) != LEFT);
 
   Stencil b;
   Interval empty;
@@ -179,7 +178,13 @@ Ottava_bracket::print (SCM smob)
   return b.smobbed_copy ();
 }
 
-ADD_INTERFACE (Ottava_bracket, "ottava-bracket-interface",
-	       "An ottava bracket",
-	       "edge-height bracket-flare shorten-pair minimum-length");
+ADD_INTERFACE (Ottava_bracket,
+	       "An ottava bracket.",
+
+	       /* properties */
+	       "edge-height "
+	       "bracket-flare "
+	       "shorten-pair "
+	       "minimum-length "
+	       );