* lily/paper-book.cc (output): call output-preview-framework

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

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index adc106edcc9f609b70d8145b4d4ee70727390c08..8f86a03eff62b9ffb5cbf0c3e6d1c6f99e5cecbb 100644 (file)
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -14,7 +14,7 @@
 #include "spanner.hh"
 #include "font-interface.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "warn.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -49,7 +49,7 @@ Ottava_bracket::print (SCM smob)
   Interval span_points;
   
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Paper_def * paper = me->get_paper ();
+  Output_def * paper = me->get_paper ();
 
   
   Drul_array<bool> broken;
@@ -88,13 +88,15 @@ Ottava_bracket::print (SCM smob)
       Interval ext;
       if (Note_column::has_interface (b))
        {
-         for (SCM s = b->get_property ("note-heads"); is_pair (s); s =ly_cdr (s))
+         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 ())
-       ext = Interval (0,0);
-      
+       {
+         Real x = b->relative_coordinate (common, X_AXIS);
+         ext = Interval (x,x);
+       }
       span_points[d] =  (broken [d]) ? b->extent (common, X_AXIS)[-d] : ext[d];
 
       if (broken[d])
@@ -156,7 +158,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);