/*
- breathing_sign.cc -- implement Breathing_sign
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1999--2005 Michael Krause
+ Copyright (C) 1999--2011 Michael Krause
+ Extensions for ancient notation (c) 2003--2011 by Juergen Reuter
- written for the GNU LilyPond music typesetter
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- TODO: --> see breathing-sign-engraver.cc
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- Extensions for ancient notation (c) 2003--2005 by Juergen Reuter
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "breathing-sign.hh"
-#include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
-#include "output-def.hh"
-#include "lookup.hh"
#include "dimensions.hh"
#include "direction.hh"
-#include "text-interface.hh"
+#include "directional-element-interface.hh"
#include "font-interface.hh"
-
-/*
- TODO: thickness should be a grob property (unit: linethickness)
- rather than hardwired to (staff_space / 6).
-*/
+#include "grob.hh"
+#include "lookup.hh"
+#include "output-def.hh"
+#include "staff-symbol.hh"
+#include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
/*
UGH : this is full of C&P code. Consolidate! --hwn
{
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_property ("thickness"), 1.0);
- if (Staff_symbol_referencer::get_staff_symbol (me))
- {
- staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
- }
- else
- staff_size = 0.0;
- Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
/*
* Draw a small vertical line through the uppermost (or, depending
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_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
/*
* Draw a vertical line that is vertically centered in the staff
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_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
// like a "|" type bar
Interval xdim (0, thickness);
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_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
// like a "||" type bar
Interval xdim (0, thickness);
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)
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 scm_from_double (inter_f * sz * d);
+ Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
+ if (staff)
+ {
+ Interval iv = Staff_symbol::line_span (staff);
+ Real inter = Staff_symbol::staff_space (me) / 2;
+ return scm_from_double (inter * iv[d]);
+ }
+
+ return scm_from_double (0.0);
}
-ADD_INTERFACE (Breathing_sign, "breathing-sign-interface",
+ADD_INTERFACE (Breathing_sign,
"A breathing sign.",
- "direction");
+
+ /* properties */
+ "direction "
+ );