source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "local-key-item.hh"
#include "molecule.hh"
#include "musical-request.hh"
#include "rhythmic-head.hh"
#include "misc.hh"
+#include "spanner.hh"
+#include "tie.hh"
#include "lookup.hh"
static SCM
-pitch_less (SCM p1, SCM p2)
+pitch_less (SCM p1, SCM p2)
{
return Pitch::less_p (gh_car (p1), gh_car (p2));
}
pitch_less_proc = gh_new_procedure2_0 ("pits-less", &pitch_less);
}
-ADD_SCM_INIT_FUNC(lkpitch,init_pitch_funcs);
+ADD_SCM_INIT_FUNC (lkpitch,init_pitch_funcs);
void
-Local_key_item::add_pitch (Score_element*me, Pitch p, bool cautionary, bool natural)
+Local_key_item::add_pitch (Grob*me, Pitch p, bool cautionary, bool natural,
+ Grob* tie_break_reminder)
{
- SCM acs = me->get_elt_property ("accidentals");
+ SCM acs = me->get_grob_property ("accidentals");
SCM pitch = p.smobbed_copy ();
SCM opts = SCM_EOL;
if (cautionary)
opts = gh_cons (ly_symbol2scm ("cautionary"), opts);
if (natural)
opts = gh_cons (ly_symbol2scm ("natural"), opts);
+ if (tie_break_reminder)
+ {
+ /* Ugh, these 'options' can't have a value, faking... */
+ opts = gh_cons (tie_break_reminder->self_scm (), opts);
+ opts = gh_cons (ly_symbol2scm ("tie-break-reminder"), opts);
+ }
pitch = gh_cons (pitch, opts);
acs = scm_merge_x (acs, gh_cons (pitch, SCM_EOL), pitch_less_proc);
- me->set_elt_property ("accidentals", acs);
+ me->set_grob_property ("accidentals", acs);
}
Molecule
-Local_key_item::parenthesize (Score_element*me, Molecule m)
+Local_key_item::parenthesize (Grob*me, Molecule m)
{
Molecule open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-("));
Molecule close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-)"));
- m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
- m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
+ m.add_at_edge (X_AXIS, LEFT, Molecule (open), 0);
+ m.add_at_edge (X_AXIS, RIGHT, Molecule (close), 0);
return m;
}
+/* HW says: maybe move to tie.cc
+
+ Note, tie should not kill all accidentals when broken, only the ones
+ that are indicated by a property tie-break-reminder, I guess
+
+ Find if any of the accidentals were created because they're at the rhs of a
+ tie. If that's the reason they exist, and the tie was NOT broken,
+ put the accidental up for deletion. Clear molecule cache. */
+MAKE_SCHEME_CALLBACK (Local_key_item, after_line_breaking, 1);
+SCM
+Local_key_item::after_line_breaking (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+
+ SCM accs = me->get_grob_property ("accidentals");
+ for (SCM s = accs;
+ gh_pair_p (s); s = gh_cdr (s))
+ {
+ SCM opts = gh_cdar (s);
+
+ SCM t = scm_memq (ly_symbol2scm ("tie-break-reminder"), opts);
+ if (t != SCM_BOOL_F)
+ {
+ Grob *tie = unsmob_grob (gh_cadr (t));
+ Spanner *sp = dynamic_cast<Spanner*> (tie);
+ if (!sp->original_l_)
+ {
+ /* there should be a better way to delete part of me */
+ scm_set_car_x (s, gh_list (gh_caar (s),
+ ly_symbol2scm ("deleted"),
+ SCM_UNDEFINED));
+ me->set_grob_property ("molecule", SCM_EOL);
+ }
+ }
+ }
+
+ return SCM_UNSPECIFIED;
+}
+
/*
UGH. clean me, revise placement routine (See Ross & Wanske;
accidental placement is more complicated than this.
*/
-MAKE_SCHEME_CALLBACK(Local_key_item,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Local_key_item,brew_molecule,1);
SCM
Local_key_item::brew_molecule (SCM smob)
{
- Score_element* me = unsmob_element (smob);
+ Grob* me = unsmob_grob (smob);
Molecule mol;
bool oct_b = false;
int lastoct = -100;
- SCM accs = me->get_elt_property ("accidentals");
- for (SCM s = accs;
+ SCM accs = me->get_grob_property ("accidentals");
+ for (SCM s = accs;
gh_pair_p (s); s = gh_cdr (s))
{
Pitch p (*unsmob_pitch (gh_caar (s)));
SCM opts = gh_cdar (s);
+ if (scm_memq (ly_symbol2scm ("deleted"), opts) != SCM_BOOL_F)
+ continue;
+
// do one octave
if (p.octave_i () != lastoct)
{
lastoct = p.octave_i () ;
- SCM c0 = me->get_elt_property ("c0-position");
+ SCM c0 = me->get_grob_property ("c0-position");
Real dy = (gh_number_p (c0) ? gh_scm2int (c0) : 0 + p.notename_i_)
* note_distance;
if (scm_memq (ly_symbol2scm ("natural"), opts) != SCM_BOOL_F)
{
Molecule prefix = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-0"));
- acc.add_at_edge(X_AXIS, LEFT, Molecule(prefix), 0);
+ acc.add_at_edge (X_AXIS, LEFT, Molecule (prefix), 0);
}
if (scm_memq (ly_symbol2scm ("cautionary"), opts) != SCM_BOOL_F)
/*
Use a cons?
*/
- pads[RIGHT] = me->get_elt_property ("right-padding");
- pads[LEFT] = me->get_elt_property ("left-padding");
+ pads[RIGHT] = me->get_grob_property ("right-padding");
+ pads[LEFT] = me->get_grob_property ("left-padding");
// unused ?
if (!gh_number_p (pads[d]))
continue;
- Box b(Interval (0, gh_scm2double (pads[d]) * note_distance),
+ Box b (Interval (0, gh_scm2double (pads[d]) * note_distance),
Interval (0,0));
Molecule m (Lookup::blank (b));
mol.add_at_edge (X_AXIS, d, m, 0);
- } while ( flip (&d)!= LEFT);
+ } while (flip (&d)!= LEFT);
}
- return mol.smobbed_copy();
+ return mol.smobbed_copy ();
}
bool
-Local_key_item::has_interface (Score_element*m)
+Local_key_item::has_interface (Grob*m)
{
return m && m->has_interface (ly_symbol2scm ("accidentals-interface"));
}
void
-Local_key_item::set_interface (Score_element*m)
+Local_key_item::set_interface (Grob*m)
{
m->set_interface (ly_symbol2scm ("accidentals-interface"));
}
projects / lilypond.git / blobdiff