/*
accidental-engraver.cc -- implement accidental_engraver
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Modified 2001-2002 by Rune Zedeler <rz@daimi.au.dk>
*/
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
#include "tie.hh"
#include "engraver.hh"
#include "arpeggio.hh"
#include "warn.hh"
-
#include "translator-group.hh"
/**
Urgh. Since the accidentals depend on lots of variables, we have to
store all information before we can really create the accidentals.
*/
- Link_array<Grob> arpeggios_;
+ Link_array<Grob> left_objects_;
+ Link_array<Grob> right_objects_;
Grob * accidental_placement_;
-
/*
The next
*/
Array<Accidental_entry> accidentals_;
-
Link_array<Grob> ties_;
-
-
};
int p = gh_number_p (prev_acc) ? gh_scm2int (prev_acc) : 0;
int num;
- if (a == p
- && !to_boolean (note->get_mus_property ("force-accidental"))
- && gh_number_p (prev_acc))
+ if (a == p && gh_number_p (prev_acc))
num = 0;
else if ( (abs (a)<abs (p) || p*a<0) && a != 0 )
num = 2;
SCM barnum = get_property ("currentBarNumber");
SCM smp = get_property("measurePosition");
Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
- if(mp<0 && gh_number_p(barnum)) barnum = scm_int2num(gh_scm2int(barnum)-1);
+ if(mp.main_part_<Rational(0) && gh_number_p(barnum)) barnum = scm_int2num(gh_scm2int(barnum)-1);
bool extra_natural_b = get_property ("extraNatural") == SCM_BOOL_T;
for (int i = 0; i < accidentals_.size (); i++)
{
num = num_caut;
cautionary = true;
}
+
+ if(num==0 && to_boolean (note->get_mus_property ("force-accidental")))
+ num=1;
bool different = num < 0;
num = abs (num);
accidentals.
*/
- for (int i = 0; i < arpeggios_.size (); i++)
- Side_position_interface::add_support (arpeggios_[i], a);
+ for (int i = 0; i < left_objects_.size (); i++)
+ Side_position_interface::add_support (left_objects_[i], a);
+ for (int i = 0; i < right_objects_.size (); i++)
+ Side_position_interface::add_support (a, right_objects_[i]);
}
accidental_placement_ = 00;
accidentals_.clear();
- arpeggios_.clear ();
+ left_objects_.clear ();
+ right_objects_.clear ();
ties_.clear ();
}
}
else if (Arpeggio::has_interface (info.grob_))
{
- arpeggios_.push (info.grob_);
+ left_objects_.push (info.grob_);
+ }
+ else if (info.grob_->internal_has_interface (ly_symbol2scm("finger-interface")))
+ {
+ left_objects_.push (info.grob_);
}
-
}
void
ENTER_DESCRIPTION (Accidental_engraver,
-"Make accidentals. Catches note heads, ties and notices key-change
-events. Due to interaction with ties (which don't come together
-with note heads), this needs to be in a context higher than Tie_engraver.",
-
+"Make accidentals. Catches note heads, ties and notices key-change "
+" events. Due to interaction with ties (which don't come together "
+" with note heads), this needs to be in a context higher than Tie_engraver.",
"Accidental",
/* accepts */ "",
- "rhythmic-head-interface tie-interface arpeggio-interface",
+ "finger-interface rhythmic-head-interface tie-interface arpeggio-interface",
"localKeySignature extraNatural autoAccidentals autoCautionaries",
"localKeySignature");