* mf/feta-schrift.mf ("Trill (`tr')"): Fix typo.

[lilypond.git] / lily / breathing-sign.cc

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 565975359fb57a25bff49f3ff2221a718299297d..59a47a127d9f21e06d3ed315df298dd201d769a0 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -10,14 +10,12 @@
   Extensions for ancient notation (c) 2003 by Juergen Reuter
 */
 
+#include "breathing-sign.hh"
+
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
-#include "breathing-sign.hh"
-#include "string.hh"
-#include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "lookup.hh"
-
 #include "dimensions.hh"
 #include "direction.hh"
 #include "text-item.hh"
@@ -55,7 +53,7 @@ Breathing_sign::divisio_minima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a small vertical line through the uppermost (or, depending
@@ -88,7 +86,7 @@ Breathing_sign::divisio_maior (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a vertical line that is vertically centered in the staff
@@ -128,7 +126,7 @@ Breathing_sign::divisio_maxima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
@@ -158,7 +156,7 @@ Breathing_sign::finalis (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
@@ -187,7 +185,7 @@ Breathing_sign::offset_callback (SCM element_smob, SCM)
 
   Real inter_f = Staff_symbol_referencer::staff_space (me)/2;
   int sz = Staff_symbol_referencer::line_count (me)-1;
-  return gh_double2scm (inter_f * sz * d);
+  return scm_make_real (inter_f * sz * d);
 }
 
 ADD_INTERFACE (Breathing_sign, "breathing-sign-interface",