* lily/book.cc (to_stencil): New method.

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

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index d77a6b6e2d643d25f02d370dbc8bc07b13b88f6e..3a13fdcf0cc93826158dcbfa49016ba95a032f57 100644 (file)
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -66,7 +66,7 @@ Ottava_bracket::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
-  SCM properties = Font_interface::font_alist_chain (me);
+  SCM properties = Font_interface::text_font_alist_chain (me);
   SCM markup = me->get_property ("text");
   Stencil text;
   if (Text_item::markup_p (markup)) 
@@ -88,8 +88,8 @@ Ottava_bracket::print (SCM smob)
       Interval ext;
       if (Note_column::has_interface (b))
        {
-         for (SCM s = b->get_property ("note-heads"); gh_pair_p (s); s =gh_cdr (s))
-           ext.unite (unsmob_grob (gh_car (s))->extent (common, X_AXIS));
+         for (SCM s = b->get_property ("note-heads"); ly_c_pair_p (s); s =ly_cdr (s))
+           ext.unite (unsmob_grob (ly_car (s))->extent (common, X_AXIS));
        }
 
       if (ext.is_empty ())
@@ -131,11 +131,12 @@ Ottava_bracket::print (SCM smob)
     edge_height[RIGHT] = 0.0;
   
   Stencil b;
+  Interval empty;
   if (!bracket_span_points.is_empty () && bracket_span_points.length () > 0.001)
     b = Tuplet_bracket::make_bracket (me,
                                      Y_AXIS, Offset (bracket_span_points.length (), 0),
                                       edge_height,
-                                     0.0,
+                                     empty,
                                      flare, shorten);
 
   /*
@@ -155,7 +156,7 @@ Ottava_bracket::print (SCM smob)
   
   b = Stencil (Box (b.extent (X_AXIS),
                     Interval (0.1,0.1)),
-               b.get_expr ());
+               b.expr ());
   
   b.translate_axis (bracket_span_points[LEFT], X_AXIS);
   text.translate_axis (span_points[LEFT], X_AXIS);