X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=e5814b4fac52b61142ab1a36671df5c971151ef8;hb=41912522362db3a9dcf9742a32e0180b1c2161f2;hp=98966e2bf4e25f67bd138b4281d1cdc32ec5efe8;hpb=34881554afeaf03a55a3a983caf9cfeaaf3ea060;p=lilypond.git diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 98966e2bf4..e5814b4fac 100644 --- 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 "output-def.hh" #include "lookup.hh" - #include "dimensions.hh" #include "direction.hh" #include "text-item.hh" @@ -25,10 +23,8 @@ /* 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); @@ -70,9 +66,9 @@ Breathing_sign::divisio_minima (SCM smob) /* 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); @@ -110,9 +106,9 @@ Breathing_sign::divisio_maior (SCM smob) /* 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); @@ -140,9 +136,9 @@ Breathing_sign::divisio_maxima (SCM smob) /* 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); @@ -172,12 +168,12 @@ 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) { Grob *me = unsmob_grob (element_smob); - + Direction d = get_grob_direction (me); if (!d) { @@ -185,11 +181,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; + Real inter_f = Staff_symbol_referencer::staff_space (me) / 2; + int sz = Staff_symbol_referencer::line_count (me) - 1; return scm_make_real (inter_f * sz * d); } ADD_INTERFACE (Breathing_sign, "breathing-sign-interface", - "A breathing sign.", - "direction"); + "A breathing sign.", + "direction");