/*
-accidental-placement.cc -- implement Accidental_placement
+ accidental-placement.cc -- implement Accidental_placement
-source file of the GNU LilyPond music typesetter
+ source file of the GNU LilyPond music typesetter
-(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+*/
#include <math.h>
-#include <libc-extension.hh>
+#include "libc-extension.hh" // isinf
#include "item.hh"
#include "skyline.hh"
#include "music.hh"
#include "note-collision.hh"
#include "accidental-interface.hh"
-MAKE_SCHEME_CALLBACK(Accidental_placement,alignment_callback, 2);
+MAKE_SCHEME_CALLBACK (Accidental_placement,alignment_callback, 2);
SCM
-Accidental_placement::alignment_callback(SCM s, SCM )
+Accidental_placement::alignment_callback (SCM s, SCM )
{
- Grob * me =unsmob_grob (s);
+ Grob * me = unsmob_grob (s);
Grob * par = me->get_parent (X_AXIS);
if (!to_boolean (par->get_property ("positioning-done")))
{
a->set_parent (me, X_AXIS);
a->add_offset_callback (alignment_callback_proc, X_AXIS);
- SCM cause = a->get_parent (Y_AXIS)->get_property("cause");
+ SCM cause = a->get_parent (Y_AXIS)->get_property ("cause");
- Music *mcause =unsmob_music (cause);
+ Music *mcause = unsmob_music (cause);
if (!mcause)
{
programming_error ("Note head has no music cause!");
entry = SCM_EOL;
}
else
- entry = gh_cdr (entry);
+ entry = scm_cdr (entry);
- entry = gh_cons (a->self_scm (), entry);
+ entry = scm_cons (a->self_scm (), entry);
accs = scm_assq_set_x (accs, key, entry);
Link_array<Grob> *break_reminder,
Link_array<Grob> *real_acc)
{
- for (SCM acs =accs->get_property ("accidental-grobs"); gh_pair_p (acs);
- acs =gh_cdr (acs))
- for (SCM s = gh_cdar (acs); gh_pair_p (s); s = gh_cdr (s))
+ for (SCM acs =accs->get_property ("accidental-grobs"); scm_is_pair (acs);
+ acs =scm_cdr (acs))
+ for (SCM s = scm_cdar (acs); scm_is_pair (s); s = scm_cdr (s))
{
- Grob *a = unsmob_grob (gh_car (s));
+ Grob *a = unsmob_grob (scm_car (s));
if (unsmob_grob (a->get_property ("tie")))
break_reminder->push (a);
which = & ra;
Interval extent;
- for (int i = 0; i < which->size(); i++)
+ for (int i = 0; i < which->size (); i++)
{
- extent.unite (which->elem(i)->extent (item_col, X_AXIS));
+ extent.unite (which->elem (i)->extent (item_col, X_AXIS));
}
if (!extent.is_empty ())
Link_array<Grob> grobs_;
Real offset_;
int notename_;
- Accidental_placement_entry()
+ Accidental_placement_entry ()
{
offset_ =0.0;
notename_ = -1;
int ape_compare (Accidental_placement_entry *const &a,
Accidental_placement_entry *const &b)
{
- return sign (ape_priority (a) - ape_priority(b));
+ return sign (ape_priority (a) - ape_priority (b));
}
int ape_rcompare (Accidental_placement_entry *const &a,
Accidental_placement_entry *const &b)
{
- return -sign (ape_priority (a) - ape_priority(b));
+ return -sign (ape_priority (a) - ape_priority (b));
}
asc.sort (&ape_compare);
- apes->clear();
+ apes->clear ();
int i =0;
int parity = 1;
- while (i < asc.size())
+ while (i < asc.size ())
{
Accidental_placement_entry * a = 0;
if (parity)
- a = asc.pop();
+ a = asc.pop ();
else
a = asc[i++];
parity = !parity;
}
- apes->reverse();
+ apes->reverse ();
}
/*
This routine computes placements of accidentals. During
- add_accidental(), accidentals are already grouped by note, so that
+ add_accidental (), accidentals are already grouped by note, so that
octaves are placed above each other; they form columns. Then the
columns are sorted: the biggest columns go closest to the note.
Then the columns are spaced as closely as possible (using skyline
SCM
Accidental_placement::position_accidentals (Grob * me)
{
- if (!me->live ())
+ if (!me->is_live ())
return SCM_UNSPECIFIED;
SCM accs = me->get_property ("accidental-grobs");
Y-position, they share an Ape, and will be printed in overstrike.
*/
Link_array<Accidental_placement_entry> apes;
- for (SCM s = accs; gh_pair_p (s); s =gh_cdr (s))
+ for (SCM s = accs; scm_is_pair (s); s =scm_cdr (s))
{
Accidental_placement_entry *ape = new Accidental_placement_entry;
- ape->notename_ = gh_scm2int (gh_caar (s));
+ ape->notename_ = scm_to_int (scm_caar (s));
- for (SCM t = gh_cdar (s); gh_pair_p (t); t =gh_cdr (t))
- ape->grobs_.push (unsmob_grob (gh_car (t)));
+ for (SCM t = scm_cdar (s); scm_is_pair (t); t =scm_cdr (t))
+ ape->grobs_.push (unsmob_grob (scm_car (t)));
apes.push (ape);
}
-
Grob *common[] = {me, 0};
/*
for (int i= apes.size (); i--;)
{
Accidental_placement_entry * ape = apes[i];
- for (int j = ape->grobs_.size(); j--;)
+ for (int j = ape->grobs_.size (); j--;)
{
Grob * a = ape->grobs_[j];
This is a little kludgy: to get all notes, we look if there are
collisions as well.
*/
- for (int i = note_cols.size() ; i--;)
+ for (int i = note_cols.size () ; i--;)
{
Grob *c = note_cols[i]->get_parent (X_AXIS);
if (Note_collision_interface::has_interface (c))
}
}
- for (int i = note_cols.size() ; i--;)
+ for (int i = note_cols.size () ; i--;)
{
heads.concat (Pointer_group_interface__extract_grobs (note_cols[i],
(Grob*)0,
"note-heads"));
}
- heads.default_sort();
- heads.uniq();
+ heads.default_sort ();
+ heads.uniq ();
common[Y_AXIS] = common_refpoint_of_array (heads, common[Y_AXIS], Y_AXIS);
ape->left_skyline_ = empty_skyline (LEFT);
ape->right_skyline_ = empty_skyline (RIGHT);
- for (int j = apes[i]->grobs_.size(); j--;)
+ for (int j = apes[i]->grobs_.size (); j--;)
{
Grob * a = apes[i]->grobs_[j];
Array<Box> boxes = Accidental_interface::accurate_boxes (a, common);
ape->extents_.concat (boxes);
- for (int j = boxes.size(); j--;)
+ for (int j = boxes.size (); j--;)
{
insert_extent_into_skyline (&ape->left_skyline_, boxes[j], Y_AXIS, LEFT);
insert_extent_into_skyline (&ape->right_skyline_ , boxes[j], Y_AXIS, RIGHT);
Interval total;
- for (int i = apes.size(); i--;)
+ for (int i = apes.size (); i--;)
{
Interval y ;
- for (int j = apes[i]->extents_.size(); j--;)
+ for (int j = apes[i]->extents_.size (); j--;)
{
y.unite (apes[i]->extents_[j][Y_AXIS]);
}
common[X_AXIS] = common_refpoint_of_array (heads, common[X_AXIS], X_AXIS);
Array<Skyline_entry> head_skyline (empty_skyline (LEFT));
Array<Box> head_extents;
- for (int i = heads.size(); i--;)
+ for (int i = heads.size (); i--;)
{
- Box b(heads[i]->extent (common[X_AXIS] , X_AXIS),
+ Box b (heads[i]->extent (common[X_AXIS] , X_AXIS),
heads[i]->extent (common[Y_AXIS], Y_AXIS));
insert_extent_into_skyline (&head_skyline, b , Y_AXIS, LEFT);
head_ape-> left_skyline_ = head_skyline;
head_ape->offset_ = 0.0;
- head_ape->offset_ -= robust_scm2double ( me->get_property ("right-padding"), 0);
-
-
Real padding = robust_scm2double (me->get_property ("padding"),0.2);
Array<Skyline_entry> left_skyline = head_ape->left_skyline_;
+ heighten_skyline (&left_skyline,
+ -robust_scm2double (me->get_property ("right-padding"), 0));
/*
Add accs entries right-to-left.
*/
left_skyline = new_left_skyline;
}
- for (int i = apes.size(); i--;)
+ for (int i = apes.size (); i--;)
{
Accidental_placement_entry* ape = apes[i];
- for (int j = ape->grobs_.size(); j--;)
+ for (int j = ape->grobs_.size (); j--;)
{
ape->grobs_[j]->translate_axis (ape->offset_, X_AXIS);
}
Interval left_extent, right_extent;
Accidental_placement_entry *ape = apes[0];
- for (int i = ape->extents_.size(); i--;)
+ for (int i = ape->extents_.size (); i--;)
left_extent.unite (ape->offset_ + ape->extents_[i][X_AXIS]);
- ape = apes.top();
- for (int i = ape->extents_.size(); i--;)
+ ape = apes.top ();
+ for (int i = ape->extents_.size (); i--;)
right_extent.unite (ape->offset_ + ape->extents_[i][X_AXIS]);
left_extent[LEFT] -= robust_scm2double (me->get_property ("left-padding"), 0);
-
-
- Interval width(left_extent[LEFT], right_extent[RIGHT]);
+ Interval width (left_extent[LEFT], right_extent[RIGHT]);
SCM scm_width = ly_interval2scm (width);
me->set_extent (scm_width, X_AXIS);
- for (int i = apes.size(); i--;)
+ for (int i = apes.size (); i--;)
delete apes[i];
return SCM_UNSPECIFIED;
}
-ADD_INTERFACE(Accidental_placement,
+ADD_INTERFACE (Accidental_placement,
"accidental-placement-interface",
"Resolve accidental collisions.",
"left-padding padding right-padding accidental-grobs positioning-done")
projects / lilypond.git / blobdiff