X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=6e342f451337a0de7f7a7301a696693f04d0d445;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=7aef7b1e68f288bde05e1604aee2014f5eb7fda7;hpb=cad05c87a0737c3a037ab7b5003c13a61db6ff57;p=lilypond.git

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 7aef7b1e68..6e342f4513 100644
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,34 +1,30 @@
 /*
   breathing_sign.cc -- implement Breathing_sign
 
-  (c)  1999--2003 Michael Krause
+  (c) 1999--2006 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--2006 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 "molecule.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "lookup.hh"
-
 #include "dimensions.hh"
 #include "direction.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "font-interface.hh"
 
 /*
   TODO: thickness should be a grob property (unit: linethickness)
- rather than hardwired to (staff_space / 6).
- */
-
-  
+  rather than hardwired to (staff_space / 6).
+*/
 
 /*
   UGH : this is full of C&P code. Consolidate!  --hwn
@@ -37,9 +33,9 @@
 /*
   Gregorian chant divisio minima.  (Actually, this was the original
   breathing sign by Michael. -- jr)
- */
-MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_minima,1);
-SCM 
+*/
+MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_minima, 1);
+SCM
 Breathing_sign::divisio_minima (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
@@ -47,15 +43,13 @@ Breathing_sign::divisio_minima (SCM smob)
   Real staff_size;
 
   Real thickness = Staff_symbol_referencer::line_thickness (me);
-  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
+  thickness *= robust_scm2double (me->get_property ("thickness"), 1.0);
   if (Staff_symbol_referencer::get_staff_symbol (me))
-    {
-      staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a small vertical line through the uppermost (or, depending
@@ -64,31 +58,29 @@ Breathing_sign::divisio_minima (SCM smob)
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * staff_space, +0.5 * staff_space);
   Box b (xdim, ydim);
-  Molecule out = Lookup::round_filled_box (b, blotdiameter);
+  Stencil out = Lookup::round_filled_box (b, blotdiameter);
   return out.smobbed_copy ();
 }
 
 /*
   Gregorian chant divisio maior.
- */
-MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maior,1);
-SCM 
+*/
+MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maior, 1);
+SCM
 Breathing_sign::divisio_maior (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staff_size;
   Real thickness = Staff_symbol_referencer::line_thickness (me);
-  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
+  thickness *= robust_scm2double (me->get_property ("thickness"), 1.0);
 
   if (Staff_symbol_referencer::get_staff_symbol (me))
-    {
-      staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   /*
    * Draw a vertical line that is vertically centered in the staff
@@ -104,80 +96,76 @@ Breathing_sign::divisio_maior (SCM smob)
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * height, +0.5 * height);
   Box b (xdim, ydim);
-  Molecule out = Lookup::round_filled_box (b, blotdiameter);
+  Stencil out = Lookup::round_filled_box (b, blotdiameter);
   return out.smobbed_copy ();
 }
 
 /*
   Gregorian chant divisio maxima.
- */
-MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maxima,1);
-SCM 
+*/
+MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maxima, 1);
+SCM
 Breathing_sign::divisio_maxima (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staff_size;
   Real thickness = Staff_symbol_referencer::line_thickness (me);
-  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
+  thickness *= robust_scm2double (me->get_property ("thickness"), 1.0);
 
   if (Staff_symbol_referencer::get_staff_symbol (me))
-    {
-      staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * staff_size, +0.5 * staff_size);
   Box b (xdim, ydim);
-  Molecule out = Lookup::round_filled_box (b, blotdiameter);
+  Stencil out = Lookup::round_filled_box (b, blotdiameter);
   return out.smobbed_copy ();
 }
 
 /*
   Gregorian chant finalis.
- */
-MAKE_SCHEME_CALLBACK (Breathing_sign,finalis,1);
-SCM 
+*/
+MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1);
+SCM
 Breathing_sign::finalis (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real staff_size;
   Real thickness = Staff_symbol_referencer::line_thickness (me);
-  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
+  thickness *= robust_scm2double (me->get_property ("thickness"), 1.0);
 
   if (Staff_symbol_referencer::get_staff_symbol (me))
-    {
-      staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
   Interval ydim (-0.5 * staff_size, +0.5 * staff_size);
   Box b (xdim, ydim);
-  Molecule line1 = Lookup::round_filled_box (b, blotdiameter);
-  Molecule line2 (line1);
+  Stencil line1 = Lookup::round_filled_box (b, blotdiameter);
+  Stencil line2 (line1);
   line2.translate_axis (0.5 * staff_space, X_AXIS);
-  line1.add_molecule (line2);
+  line1.add_stencil (line2);
 
   return line1.smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Breathing_sign,offset_callback,2);
+MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 1);
 SCM
-Breathing_sign::offset_callback (SCM element_smob, SCM)
+Breathing_sign::offset_callback (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
-  
+  Grob *me = unsmob_grob (smob);
+
   Direction d = get_grob_direction (me);
   if (!d)
     {
@@ -185,11 +173,11 @@ Breathing_sign::offset_callback (SCM element_smob, SCM)
       set_grob_direction (me, d);
     }
 
-  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);
+  Real inter_f = Staff_symbol_referencer::staff_space (me) / 2;
+  int sz = Staff_symbol_referencer::line_count (me) - 1;
+  return scm_from_double (inter_f * sz * d);
 }
 
-ADD_INTERFACE(Breathing_sign, "breathing-sign-interface",
-	      "A breathing sign.",
-	      "direction");
+ADD_INTERFACE (Breathing_sign, "breathing-sign-interface",
+	       "A breathing sign.",
+	       "direction");