/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2001--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2001--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "paper-column.hh"
#include "pitch.hh"
#include "stencil.hh"
+#include "system.hh"
#include "skyline-pair.hh"
Stencil
return m;
}
-/* If this gets called before line breaking, we will return a non-trivial
- extent even if we belong to a tie and won't actually get printed. */
-static SCM
-get_extent (Grob *me, Axis a)
-{
- Stencil *s = unsmob_stencil (Accidental_interface::get_stencil (me));
-
- if (s)
- return ly_interval2scm (s->extent (a));
- return ly_interval2scm (Interval ());
-}
-
-MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1);
-SCM
-Accidental_interface::height (SCM smob)
-{
- return get_extent (unsmob_grob (smob), Y_AXIS);
-}
-
-MAKE_SCHEME_CALLBACK (Accidental_interface, width, 1);
-SCM
-Accidental_interface::width (SCM smob)
-{
- return get_extent (unsmob_grob (smob), X_AXIS);
-}
-
MAKE_SCHEME_CALLBACK (Accidental_interface, horizontal_skylines, 1);
SCM
Accidental_interface::horizontal_skylines (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
if (!me->is_live ())
return Skyline_pair ().smobbed_copy ();
- /*
- * Using the print function may trigger a suicide
- * before line breaking. It is therefore `unpure' (c).
- * We use the more basic get_stencil.
- */
- Stencil *my_stencil = unsmob_stencil (get_stencil (me));
+ Stencil *my_stencil = unsmob<Stencil> (me->get_property ("stencil"));
+ if (!my_stencil)
+ return Skyline_pair ().smobbed_copy ();
+
Skyline_pair *sky =
- Skyline_pair::unsmob
+ unsmob<Skyline_pair>
(Stencil::skylines_from_stencil
(my_stencil->smobbed_copy (), 0.0, Y_AXIS));
- if (!sky)
- return Skyline_pair ().smobbed_copy ();
-
SCM alist = me->get_property ("glyph-name-alist");
SCM alt = me->get_property ("alteration");
string glyph_name = robust_scm2string (ly_assoc_get (alt, alist, SCM_BOOL_F),
return sky->smobbed_copy ();
}
-MAKE_SCHEME_CALLBACK (Accidental_interface, pure_height, 3);
+MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1);
SCM
-Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM)
+Accidental_interface::height (SCM smob)
{
- Item *me = dynamic_cast<Item *> (unsmob_grob (smob));
- int start = scm_to_int (start_scm);
- int rank = me->get_column ()->get_rank ();
-
- if (to_boolean (me->get_property ("forced"))
- || !unsmob_grob (me->get_object ("tie"))
- || (rank == start + 1 && /* we are at the start of a line */
- !to_boolean (me->get_property ("hide-tied-accidental-after-break"))))
- {
- Stencil *s = unsmob_stencil (get_stencil (me));
- if (s)
- return ly_interval2scm (s->extent (Y_AXIS));
- }
+ Grob *me = unsmob<Grob> (smob);
+ Grob *tie = unsmob<Grob> (me->get_object ("tie"));
- return ly_interval2scm (Interval ());
+ if (tie
+ && !to_boolean (me->get_property ("forced"))
+ && to_boolean (me->get_property ("hide-tied-accidental-after-break")))
+ return ly_interval2scm (Interval ());
+
+ return Grob::stencil_height (smob);
}
-MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1);
+MAKE_SCHEME_CALLBACK (Accidental_interface, remove_tied, 1);
SCM
-Accidental_interface::print (SCM smob)
+Accidental_interface::remove_tied (SCM smob)
{
- Grob *me = unsmob_grob (smob);
- Grob *tie = unsmob_grob (me->get_object ("tie"));
+ Grob *me = unsmob<Grob> (smob);
+ Grob *tie = unsmob<Grob> (me->get_object ("tie"));
if (tie
+ && !to_boolean (me->get_property ("forced"))
&& (to_boolean (me->get_property ("hide-tied-accidental-after-break"))
- || (!tie->original () && !to_boolean (me->get_property ("forced")))))
- {
- me->suicide ();
- return SCM_EOL;
- }
+ || !tie->original()))
+ me->suicide ();
+
+ return SCM_UNSPECIFIED;
+}
+
+MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1);
+SCM
+Accidental_interface::print (SCM smob)
+{
+ Grob *me = unsmob<Grob> (smob);
return get_stencil (me);
}
SCM alist = me->get_property ("glyph-name-alist");
SCM alt = me->get_property ("alteration");
SCM glyph_name = ly_assoc_get (alt, alist, SCM_BOOL_F);
+ Stencil mol;
if (!scm_is_string (glyph_name))
{
me->warning (_f ("Could not find glyph-name for alteration %s",
ly_scm_write_string (alt).c_str ()));
- return SCM_EOL;
+ mol = fm->find_by_name ("noteheads.s1cross");
}
+ else
+ mol = fm->find_by_name (ly_scm2string (glyph_name));
- Stencil mol (fm->find_by_name (ly_scm2string (glyph_name)));
if (to_boolean (me->get_property ("restore-first")))
{
/*