* lily/note-column.cc (translate_rests): call flush_extent_cache()

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

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 489a32296f089e5bb2265430b9aab79f5ce7156c..ff34cc61133d93bc7ba1e2ebada35c29e4df11ab 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,23 +1,21 @@
 /*
   breathing_sign.cc -- implement Breathing_sign
 
-  (c) 1999--2004 Michael Krause
+  (c) 1999--2005 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
   TODO: --> see breathing-sign-engraver.cc
 
-  Extensions for ancient notation (c) 2003 by Juergen Reuter
+  Extensions for ancient notation (c) 2003--2005 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"
@@ -38,7 +36,7 @@
   Gregorian chant divisio minima.  (Actually, this was the original
   breathing sign by Michael. -- jr)
  */
-MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_minima,1);
+MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_minima, 1);
 SCM 
 Breathing_sign::divisio_minima (SCM smob)
 {
@@ -55,7 +53,7 @@ Breathing_sign::divisio_minima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a small vertical line through the uppermost (or, depending
@@ -71,7 +69,7 @@ Breathing_sign::divisio_minima (SCM smob)
 /*
   Gregorian chant divisio maior.
  */
-MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maior,1);
+MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maior, 1);
 SCM 
 Breathing_sign::divisio_maior (SCM smob)
 {
@@ -88,7 +86,7 @@ Breathing_sign::divisio_maior (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a vertical line that is vertically centered in the staff
@@ -111,7 +109,7 @@ Breathing_sign::divisio_maior (SCM smob)
 /*
   Gregorian chant divisio maxima.
  */
-MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maxima,1);
+MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maxima, 1);
 SCM 
 Breathing_sign::divisio_maxima (SCM smob)
 {
@@ -128,7 +126,7 @@ Breathing_sign::divisio_maxima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
@@ -141,7 +139,7 @@ Breathing_sign::divisio_maxima (SCM smob)
 /*
   Gregorian chant finalis.
  */
-MAKE_SCHEME_CALLBACK (Breathing_sign,finalis,1);
+MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1);
 SCM 
 Breathing_sign::finalis (SCM smob)
 {
@@ -158,7 +156,7 @@ Breathing_sign::finalis (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
@@ -172,7 +170,7 @@ Breathing_sign::finalis (SCM smob)
   return line1.smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Breathing_sign,offset_callback,2);
+MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 2);
 SCM
 Breathing_sign::offset_callback (SCM element_smob, SCM)
 {
@@ -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",