lyric spacing on the penultimate column.
+2004-12-09 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/paper-column.cc (Paper_column): copy rank_. This fixes
+ lyric spacing on the penultimate column.
+
2004-12-05 Christian Hitz <chhitz@gmx.net>
* configure.in:
{
cmp = (lo + hi) / 2;
- result = compare (t, arr[cmp]);
+ result = (*compare) (t, arr[cmp]);
if (result < 0)
hi = cmp;
int notename_;
Accidental_placement_entry ()
{
- offset_ =0.0;
+ offset_ = 0.0;
notename_ = -1;
}
};
apes->clear ();
- int i =0;
+ int i = 0;
int parity = 1;
while (i < asc.size ())
{
for (int i = 256 >? fi->numOfChars; i--;)
ascii_to_metric_idx_.push (-1);
- for (int i=0; i < fi->numOfChars; i++)
+ for (int i= 0; i < fi->numOfChars; i++)
{
AFM_CharMetricInfo * c = fi->cmi + i;
AFM_CharMetricInfo const*
Adobe_font_metric::find_ascii_metric (int a) const
{
- if (ascii_to_metric_idx_[a] >=0)
+ if (ascii_to_metric_idx_[a] >= 0)
{
int code = ascii_to_metric_idx_[a];
if (code >= 0)
Link_array<Grob> elems
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
- Real where_f=0;
+ Real where_f= 0;
Interval v;
v.set_empty ();
elems.del (j);
}
- for (int j =0; j < elems.size (); j++)
+ for (int j = 0; j < elems.size (); j++)
{
where_f += stacking_dir * dy;
translates.push (where_f);
Link_array<Grob> elems;
Link_array<Grob> all_grobs
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
- for (int i=0; i < all_grobs.size (); i++)
+ for (int i= 0; i < all_grobs.size (); i++)
{
Interval y = all_grobs[i]->extent (me, a);
if (!y.is_empty ())
Array<Real> translates ;
Interval total;
- Real where_f=0;
+ Real where_f= 0;
- for (int j=0 ; j < elems.size (); j++)
+ for (int j= 0 ; j < elems.size (); j++)
{
Real dy = - dims[j][-stacking_dir];
if (j)
Array<Real> all_translates;
if (translates.size ())
{
- int i =0;
- int j =0;
+ int i = 0;
+ int j = 0;
Real w = translates[0];
while (j < all_grobs.size ())
{
Audio_element_info::Audio_element_info (Audio_element*s, Music *r)
{
elem_ = s;
- origin_trans_ =0;
+ origin_trans_ = 0;
event_ = r;
}
{
elem_ = 0;
event_ = 0;
- origin_trans_ =0;
+ origin_trans_ = 0;
}
if (!staffline_)
return ;
- for (int i=0; i < elts_.size (); i++)
+ for (int i= 0; i < elts_.size (); i++)
{
if (!unsmob_grob (elts_[i]->get_property ("axis-group-parent-Y")))
{
Bar_engraver::Bar_engraver ()
{
- bar_ =0;
+ bar_ = 0;
}
void
Bar_number_engraver::Bar_number_engraver ()
{
- text_ =0;
+ text_ = 0;
}
{
text_->set_property ("side-support-elements", get_property ("stavesFound"));
- text_ =0;
+ text_ = 0;
}
}
Beam_engraver::Beam_engraver ()
{
beam_ = 0;
- finished_beam_ =0;
- finished_beam_info_=0;
- beam_info_ =0;
+ finished_beam_ = 0;
+ finished_beam_info_= 0;
+ beam_info_ = 0;
now_stop_ev_ = 0;
start_ev_ = 0;
- prev_start_ev_ =0;
+ prev_start_ev_ = 0;
}
bool
Beam::set_beaming (finished_beam_, finished_beam_info_);
delete finished_beam_info_;
- finished_beam_info_ =0;
+ finished_beam_info_ = 0;
finished_beam_ = 0;
}
}
Array<Quant_score> qscores;
- for (int l =0; l < quantsl.size (); l++)
- for (int r =0; r < quantsr.size (); r++)
+ for (int l = 0; l < quantsl.size (); l++)
+ for (int r = 0; r < quantsr.size (); r++)
{
Quant_score qs;
qs.yl = quantsl[l];
Drul_array<Real> score (0, 0);
Drul_array<int> count (0, 0);
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
for (int i = lslice[-left_dir];
(i - lslice[left_dir])* left_dir <= 0 ; i+= left_dir)
{
- int count =0;
+ int count = 0;
for ( SCM s = scm_car (right_beaming); scm_is_pair (s); s = scm_cdr (s))
{
int k = - right_dir * scm_to_int (scm_car (s)) + i;
Real break_overshoot = 3.0;
Real w = (i > 0 && st) ? (xposn - last_xposn) : break_overshoot;
- Real stem_offset =0.0;
+ Real stem_offset = 0.0;
if (i > 0)
{
w += last_stem_width / 2;
Link_array<Grob> stems=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
do {
Grob *s = stems[i];
Direction sd = get_grob_direction (s);
Link_array<Grob> stems
=Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
- for (int i=0; i <stems.size (); i++)
+ for (int i= 0; i <stems.size (); i++)
{
Grob *s = stems[i];
Real staff_space = Staff_symbol_referencer::staff_space (me);
Array<Interval> hps_array;
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob* stem = stems[i];
if (Stem::is_invisible (stem))
}
Interval max_gap;
- Real max_gap_len =0.0;
+ Real max_gap_len = 0.0;
for (int i = gaps.allowed_regions_.size () -1; i >= 0 ; i--)
{
+ lvs->relative_coordinate (commony, Y_AXIS) - my_y);
Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob* s = stems[i];
Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
- Real y =0;
+ Real y = 0;
Real slope = 0;
Real dy = 0;
else
{
Array<Offset> ideals;
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
return SCM_UNSPECIFIED;
Real x0 =fvs->relative_coordinate (commonx, X_AXIS);
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob* s = stems[i];
*/
Interval feasible_left_point;
feasible_left_point.set_full ();
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
scale_drul (&pos, staff_space);
bool gap = false;
- Real thick =0.0;
+ Real thick = 0.0;
if (scm_is_number (me->get_property ("gap-count"))
&&scm_to_int (me->get_property ("gap-count")))
{
Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0;
Real xr = lvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0;
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
Pointer_group_interface__extract_grobs (me, (Grob *)0, "stems");
Direction d = LEFT;
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
/*
Don't overwrite user settings.
Link_array<Grob>stems =
Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
int f = 0;
- for (int i=0; i < stems.size (); i++)
+ for (int i= 0; i < stems.size (); i++)
{
Grob *s = stems[i];
Formula of the bezier 3-spline
- sum_{j=0}^3 (3 over j) z_j (1-t)^ (3-j) t^j
+ sum_{j= 0}^3 (3 over j) z_j (1-t)^ (3-j) t^j
A is the axis of X coordinate.
Real one_min_tj = (1-t)* (1-t)* (1-t);
Offset o;
- for (int j=0 ; j < 4; j++)
+ for (int j= 0 ; j < 4; j++)
{
o += control_[j] * binomial_coefficient (3, j)
* pow (t,j) * pow (1-t, 3-j);
Bezier::polynomial (Axis a)const
{
Polynomial p (0.0);
- for (int j=0; j <= 3; j++)
+ for (int j= 0; j <= 3; j++)
{
p +=
(control_[j][a] * binomial_coefficient (3, j))
void
Bezier::assert_sanity () const
{
- for (int i=0; i < CONTROL_COUNT; i++)
+ for (int i= 0; i < CONTROL_COUNT; i++)
assert (!isnan (control_[i].length ())
&& !isinf (control_[i].length ()));
}
Bezier::reverse ()
{
Bezier b2;
- for (int i =0; i < CONTROL_COUNT; i++)
+ for (int i = 0; i < CONTROL_COUNT; i++)
b2.control_[CONTROL_COUNT-i-1] = control_[i];
*this = b2;
}
Link_array<Grob> all = pscore_->system_->columns ();
Array<int> retval;
- for (int i=0; i < all.size (); i++)
+ for (int i= 0; i < all.size (); i++)
if (Item::is_breakable (all[i]))
retval.push (i);
Link_array<Grob> all = pscore_->system_->columns ();
Link_array<Grob> retval;
- for (int i=0; i < all.size (); i++)
+ for (int i= 0; i < all.size (); i++)
if (Item::is_breakable (all[i]))
retval.push (all[i]);
Array<Interval> extents;
int last_nonempty = -1;
- for (int i=0; i < elems.size (); i++)
+ for (int i= 0; i < elems.size (); i++)
{
Interval y = elems[i]->extent (elems[i], X_AXIS);
extents.push (y);
Real here = 0.0;
Interval total_extent;
- Real alignment_off =0.0;
- for (int i =0 ; i < offsets.size (); i++)
+ Real alignment_off = 0.0;
+ for (int i = 0 ; i < offsets.size (); i++)
{
here += offsets[i];
if (i == edge_idx)
alignment_off = -total_extent[LEFT];
here = alignment_off;
- for (int i =0 ; i < offsets.size (); i++)
+ for (int i = 0 ; i < offsets.size (); i++)
{
here += offsets[i];
elems[i]->translate_axis (here, X_AXIS);
}
Substitution_entry ()
{
- grob_ =0;
+ grob_ = 0;
left_ = right_ = -2;
}
SCM pitches = SCM_EOL;
Music* inversion_event = 0;
- for (int i =0 ; i < notes_.size (); i++)
+ for (int i = 0 ; i < notes_.size (); i++)
{
Music *n = notes_[i];
SCM p = n->get_property ("pitch");
Chord_tremolo_engraver::Chord_tremolo_engraver ()
{
beam_ = finished_beam_ = 0;
- repeat_ =0;
+ repeat_ = 0;
flags_ = 0;
stem_tremolo_ = 0;
sequential_body_b_ = false;
}
}
- clef_ =0;
+ clef_ = 0;
octavate_ = 0;
}
#include "engraver.hh"
#include "axis-group-interface.hh"
-/*
- collect Note_column, and as soon as there are 2 or more, put them in
- a collision object. */
class Collision_engraver : public Engraver
{
Item * col_;
}
- for (int i=0; i< note_columns_.size (); i++)
+ for (int i= 0; i< note_columns_.size (); i++)
Note_collision_interface::add_column (col_,note_columns_[i]);
}
void
Collision_engraver::stop_translation_timestep ()
{
- col_ =0;
+ col_ = 0;
note_columns_.clear ();
}
Collision_engraver::Collision_engraver ()
{
- col_ =0;
+ col_ = 0;
}
ENTER_DESCRIPTION (Collision_engraver,
-/* descr */ "",
+/* descr */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
/* creats*/ "NoteCollision",
/* accepts */ "",
/* acks */ "note-column-interface",
accepteds.push (t);
Link_array<Context_def> best_result;
- for (int i=0; i < accepteds.size (); i++)
+ for (int i= 0; i < accepteds.size (); i++)
{
/* do not check aliases, because \context Staff should not
create RhythmicStaff. */
}
int best_depth= INT_MAX;
- for (int i=0; i < accepteds.size (); i++)
+ for (int i= 0; i < accepteds.size (); i++)
{
Context_def * g = accepteds[i];
Interpretation_context_handle::Interpretation_context_handle ()
{
- outlet_ =0;
+ outlet_ = 0;
}
Interpretation_context_handle::Interpretation_context_handle (Interpretation_context_handle const&s)
{
- outlet_ =0;
+ outlet_ = 0;
if (s.outlet_)
up (s.outlet_);
}
Context * current = this;
// start at 1. The first one (index 0) will be us.
- for (int i=0; i < path.size (); i++)
+ for (int i= 0; i < path.size (); i++)
{
SCM ops = (i == path.size () -1) ? operations : SCM_EOL;
{
warning (_f ("Cannot find or create new `%s'",
ly_symbol2string (n).to_str0 ()));
- ret =0;
+ ret = 0;
}
return ret;
}
Context * current = this;
// start at 1. The first one (index 0) will be us.
- for (int i=0; i < path.size (); i++)
+ for (int i= 0; i < path.size (); i++)
{
SCM ops = (i == path.size () -1) ? operations : SCM_EOL;
{
warning (_f ("Cannot find or create `%s' called `%s'",
ly_symbol2string (n).to_str0 (), id));
- ret =0;
+ ret = 0;
}
return ret;
}
offsets_left_ = 0;
offset_callbacks_ = SCM_EOL;
- offset_ =0.0;
+ offset_ = 0.0;
- parent_ =0;
+ parent_ = 0;
}
if (stem_ && dotcol_)
dotcol_->set_property ("stem", stem_->self_scm ());
- dotcol_ =0;
+ dotcol_ = 0;
heads_.clear ();
- stem_ =0;
+ stem_ = 0;
}
void
Dot_position ()
{
dot_ = 0;
- pos_ =0;
+ pos_ = 0;
dir_ = CENTER;
}
};
{
if (new_cfg.find (p) == new_cfg.end ())
{
- offset =0;
+ offset = 0;
}
new_cfg[p + offset] = i->second;
}
{
if (new_cfg.find (p) == new_cfg.end ())
{
- offset =0;
+ offset = 0;
}
new_cfg[p + offset] = i->second;
dots.del (i);
Dot_configuration cfg;
- for (int i =0;i < dots.size (); i++)
+ for (int i = 0;i < dots.size (); i++)
{
Dot_position dp;
dp.dot_ = dots[i];
Drum_notes_engraver::process_music ()
{
SCM tab = 0;
- for (int i=0; i < events_.size (); i++)
+ for (int i= 0; i < events_.size (); i++)
{
if (!tab)
tab = get_property ("drumStyleTable");
{
if (Stem::has_interface (inf.grob_))
{
- for (int i=0; i < scripts_.size (); i++)
+ for (int i= 0; i < scripts_.size (); i++)
{
Grob*e = scripts_[i];
}
else if (Note_column::has_interface (inf.grob_))
{
- for (int i=0; i < scripts_.size (); i++)
+ for (int i= 0; i < scripts_.size (); i++)
{
Grob *e = scripts_[i];
void
Drum_note_performer::create_audio_elements ()
{
- SCM tab =0;
+ SCM tab = 0;
if (!tab) tab = get_property ("drumPitchTable");
while (note_evs_.size ())
// why don't grace notes show up here?
// --> grace notes effectively do not get delayed
Global_context * global = get_global_context ();
- for (int i=0; i < notes_.size (); i++)
+ for (int i= 0; i < notes_.size (); i++)
{
Audio_note* n = notes_[i];
Moment m= n->delayed_until_mom_;
}
Moment now = now_mom ();
- for (int i=0; i < notes_.size (); i++)
+ for (int i= 0; i < notes_.size (); i++)
{
play_element (notes_[i]);
}
notes_.clear ();
note_evs_.clear ();
- for (int i=0; i < delayeds_.size (); i++)
+ for (int i= 0; i < delayeds_.size (); i++)
{
Audio_note* n = delayeds_[i];
if (n->delayed_until_mom_ <= now)
line_spanner_ = 0;
finished_line_spanner_ = 0;
current_cresc_ev_ = 0;
- cresc_ =0;
+ cresc_ = 0;
script_ev_ = 0;
accepted_spanreqs_drul_[START] = 0;
add_bound_item (finished_line_spanner_,
finished_cresc_->get_bound (RIGHT));
}
- finished_cresc_ =0;
+ finished_cresc_ = 0;
}
script_ = 0;
SCM meta_sym = ly_symbol2scm ("meta");
- for (int j =0; j < announce_infos_.size (); j++)
+ for (int j = 0; j < announce_infos_.size (); j++)
{
Grob_info info = announce_infos_[j];
if (!pending_extender_->get_bound (RIGHT))
pending_extender_->warning (_ ("unterminated extender"));
- pending_extender_ =0;
+ pending_extender_ = 0;
}
}
{
if (Stem::has_interface (inf.grob_))
{
- for (int i=0; i < fingerings_.size (); i++)
+ for (int i= 0; i < fingerings_.size (); i++)
{
Side_position_interface::add_support (fingerings_[i], inf.grob_);
}
}
else if (Rhythmic_head::has_interface (inf.grob_))
{
- for (int i=0; i < fingerings_.size (); i++)
+ for (int i= 0; i < fingerings_.size (); i++)
{
Grob*t = fingerings_[i];
Side_position_interface::add_support (t,inf.grob_);
if (!alternative_iter_->ok ())
{
alternative_iter_->quit ();
- alternative_iter_ =0;
+ alternative_iter_ = 0;
}
}
}
{
if (last_line_ && last_line_->get_bound (RIGHT))
{
- last_line_ =0;
+ last_line_ = 0;
}
if (line_)
{
warning (msg);
line_->suicide ();
- line_ =0;
+ line_ = 0;
}
}
if (m < now_mom_)
programming_error ("Trying to freeze in time.");
- for (int i=0; i < extra_mom_pq_.size (); i++)
+ for (int i= 0; i < extra_mom_pq_.size (); i++)
if (extra_mom_pq_[i] == m)
return;
extra_mom_pq_.insert (m);
void
call_constructors ()
{
- for (int i=0; i < ctor_global_statics_->size (); i++)
+ for (int i= 0; i < ctor_global_statics_->size (); i++)
(ctor_global_statics_->elem (i)) ();
}
void
print_break_nodes (Array<Break_node> const & arr)
{
- for (int i =0; i < arr.size (); i++)
+ for (int i = 0; i < arr.size (); i++)
{
printf ( "node %d: ", i);
arr[i].print ();
Grob_pitch_tuple::Grob_pitch_tuple ()
{
- head_ =0;
+ head_ = 0;
end_ = 0;
}
{
SCM l = get_property (onames[a]);
- if (scm_ilength (l) >=0)
+ if (scm_ilength (l) >= 0)
{
dim_cache_[a].offset_callbacks_ = l;
dim_cache_[a].offsets_left_ = scm_ilength (l);
finished_hyphen_->warning (_("unterminated hyphen; removing"));
finished_hyphen_->suicide ();
}
- finished_hyphen_ =0;
+ finished_hyphen_ = 0;
}
}
if (finished_hyphen_ && hyphen_)
{
programming_error ("Haven't finished hyphen yet.");
- finished_hyphen_ =0;
+ finished_hyphen_ = 0;
}
if (hyphen_)
Simple_spacer_wrapper* generate_spacing_problem (Link_array<Grob> const &, Interval) const;
- virtual Array<Column_x_positions> do_solve () const=0;
+ virtual Array<Column_x_positions> do_solve () const= 0;
public:
Simple_spacer* (*get_line_spacer) ();
voiceA = \notes { \grace b16 c'2 }
voiceB = \notes { c'2 \voiceA }
- the iterator for voiceB will contain a fixup entry with (START=0/1,
+ the iterator for voiceB will contain a fixup entry with (START= 0/1,
LENGTH=2/1, GRACE_START=(0G-1/16) )
Graces at the start of a sequential music iterator are handled
for administration of what was done already
*/
enum Grob_status {
- ORPHAN=0, // not yet added to Paper_score
+ ORPHAN= 0, // not yet added to Paper_score
PRECALCING,
PRECALCED, // calcs before spacing done
POSTCALCING, // busy calculating. This is used to trap cyclic deps.
Item::Item (SCM s, Object_key const *key)
: Grob (s, key)
{
- broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0;
+ broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]= 0;
Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("item-interface"));
}
Item::Item (Item const &s, int copy_count)
: Grob (s, copy_count)
{
- broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0;
+ broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] = 0;
}
{
Real sx = 0.0;
Real sy = 0.0;
- Real sqx =0.0;
+ Real sqx = 0.0;
Real sxy = 0.0;
- for (int i=0; i < input.size ();i++)
+ for (int i= 0; i < input.size ();i++)
{
Real x=input[i][X_AXIS];
Real y = input[i][Y_AXIS];
}
int N = input.size ();
- *coef =0.0;
- *offset =0.;
+ *coef = 0.0;
+ *offset = 0.;
Real den = (N*sqx - sqr (sx));
if (!N || !den)
Interval max_size = reqs[Paper_column::get_rank (h->get_column ())][Direction (sign(pos))].ledger_extent_;
ledger_size.intersect (max_size);
- Real left_shorten =0.0;
+ Real left_shorten = 0.0;
if (Grob * g = unsmob_grob (h->get_property ("accidental-grob")))
{
Interval accidental_size = g->extent (common[X_AXIS], X_AXIS);
error_level_ = 1;
}
- for (int i=0; i < n; i++)
+ for (int i= 0; i < n; i++)
{
yyinput ();
}
void
strip_leading_white (String&s)
{
- int i=0;
+ int i= 0;
for (; i < s.length (); i++)
if (!isspace (s[i]))
break;
s = String (chars);
delete[] chars;
- int i =0;
+ int i = 0;
if ((i=s.index ("\\,")) != -1) // change "\," to TeX's "\c "
{
* (s.get_str0 () + i + 1) = 'c';
Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
{
- music_iter_ =0;
- lyric_iter_ =0;
+ music_iter_ = 0;
+ lyric_iter_ = 0;
if (!busy_req)
{
Mark_engraver::Mark_engraver ()
{
- text_ =0;
+ text_ = 0;
mark_ev_ = 0;
}
{
SCM lst = get_property ("stavesFound");
text_->set_property ("side-support-elements" , lst);
- text_ =0;
+ text_ = 0;
}
mark_ev_ = 0;
}
Metronome_mark_engraver::Metronome_mark_engraver ()
{
- text_ =0;
+ text_ = 0;
mark_ev_ = 0;
}
text_->set_parent (mc, X_AXIS);
text_->set_property ("side-support-elements" , get_property ("stavesFound"));
- text_ =0;
+ text_ = 0;
}
mark_ev_ = 0;
}
Moment stop_mom = note->get_length () + ptr->audio_column_->at_mom ();
bool play_start = true;
- for (int i=0; i < stop_note_queue.size (); i++)
+ for (int i= 0; i < stop_note_queue.size (); i++)
{
/* if this pith already in queue */
if (stop_note_queue[i].val->get_pitch () == note->get_pitch ())
intlog2 (int d)
{
assert (d);
- int i=0;
+ int i= 0;
while ((d != 1))
{
d /= 2;
bar_seen_ = false;
start_measure_ = 0;
mmrest_ = 0;
- last_rest_ =0;
+ last_rest_ = 0;
rest_ev_ = 0;
}
*/
Direction d = DOWN;
do {
- Grob *last =0;
- for (int i=0; i <numbers_.size (); i++)
+ Grob *last = 0;
+ for (int i= 0; i <numbers_.size (); i++)
{
if (scm_int2num (d) == numbers_[i]->get_property ("direction"))
{
} while (flip (&d) != DOWN);
}
- for (int i =0 ; i < numbers_.size (); i++)
+ for (int i = 0 ; i < numbers_.size (); i++)
{
Side_position_interface::add_support (numbers_[i], mmrest_);
numbers_[i]->set_parent (mmrest_, Y_AXIS);
Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
- for (int i=0; i < 4; i++)
+ for (int i= 0; i < 4; i++)
{
Item *li = combinations[i][0];
Item *ri = combinations[i][1];
SCM
Music_iterator::get_static_get_iterator (Music *m)
{
- Music_iterator * p =0;
+ Music_iterator * p = 0;
SCM ctor = m->get_property ("iterator-ctor") ;
SCM iter = SCM_EOL;
music_list_to_relative (SCM l,Pitch p, bool ret_first)
{
Pitch first = p;
- int count=0;
+ int count= 0;
Pitch last = p;
for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
{
music_found_ = false;
made_association_ = false;
- lyric_iter_ =0;
- music_context_ =0;
+ lyric_iter_ = 0;
+ music_context_ = 0;
lyrics_context_ = 0;
/*
bool distant_half_collide = false;
bool full_collide = false;
- int i = 0, j=0;
+ int i = 0, j= 0;
while (i < ups.size () && j < dps.size ())
{
if (abs (ups[i] - dps[j]) == 1)
Direction d = UP;
do
{
- for (int i=0; i < clash_groups[d].size (); i++)
+ for (int i= 0; i < clash_groups[d].size (); i++)
(*offsets)[d][i] += d * shift_amount;
}
while ((flip (&d))!= UP);
Array<int> & shift (shifts[d]);
Link_array<Grob> & clashes (clash_groups[d]);
- for (int i=0; i < clashes.size (); i++)
+ for (int i= 0; i < clashes.size (); i++)
{
SCM sh
= clashes[i]->get_property ("horizontal-shift");
d = UP;
do
{
- for (int i=0; i < clash_groups[d].size (); i++)
+ for (int i= 0; i < clash_groups[d].size (); i++)
{
Slice s (Note_column::head_positions_interval (clash_groups[d][i]));
s[LEFT] --;
do
{
- for (int i=0; i < clash_groups[d].size (); i++)
+ for (int i= 0; i < clash_groups[d].size (); i++)
tups = scm_cons (scm_cons (clash_groups[d][i]->self_scm (),
scm_make_real (offsets[d][i])),
tups);
void
Note_heads_engraver::process_music ()
{
- for (int i=0; i < note_evs_.size (); i++)
+ for (int i= 0; i < note_evs_.size (); i++)
{
Music * ev = note_evs_[i];
Note_name_engraver::process_music ()
{
String s ;
- for (int i=0; i < events_.size (); i++)
+ for (int i= 0; i < events_.size (); i++)
{
if (i)
s += " ";
// why don't grace notes show up here?
// --> grace notes effectively do not get delayed
Global_context * global = get_global_context ();
- for (int i=0; i < notes_.size (); i++)
+ for (int i= 0; i < notes_.size (); i++)
{
Audio_note* n = notes_[i];
Moment m= n->delayed_until_mom_;
}
Moment now = now_mom ();
- for (int i=0; i < notes_.size (); i++)
+ for (int i= 0; i < notes_.size (); i++)
{
play_element (notes_[i]);
}
notes_.clear ();
note_evs_.clear ();
- for (int i=0; i < delayeds_.size (); i++)
+ for (int i= 0; i < delayeds_.size (); i++)
{
Audio_note* n = delayeds_[i];
if (n->delayed_until_mom_ <= now)
Ottava_spanner_engraver::Ottava_spanner_engraver ()
{
finished_ = 0;
- span_ =0;
+ span_ = 0;
last_ottavation_ = SCM_EOL;
}
: Item (src, count)
{
system_ = 0;
- rank_ = count;
+ rank_ = src.rank_;
}
Part_combine_engraver::Part_combine_engraver ()
{
text_ = 0;
- event_ =0;
+ event_ = 0;
}
void
{
perc_ = 0;
finished_perc_ = 0;
- repeat_ =0;
+ repeat_ = 0;
double_percent_ = 0;
}
Performance::Performance ()
{
- midi_ =0;
+ midi_ = 0;
audio_elem_p_list_ = 0;
}
void
Performer_group_performer::acknowledge_audio_elements ()
{
- for (int j =0; j < announce_infos_.size (); j++)
+ for (int j = 0; j < announce_infos_.size (); j++)
{
Audio_element_info info = announce_infos_[j];
void
Piano_pedal_performer::stop_translation_timestep ()
{
- for (int i=0; i< audios_.size (); i++)
+ for (int i= 0; i< audios_.size (); i++)
play_element (audios_[i]);
audios_.clear ();
}
if (fold)
return Music_sequence::maximum_length (alternatives ());
- Moment m =0;
- int done =0;
+ Moment m = 0;
+ int done = 0;
SCM p = alternatives ();
while (scm_is_pair (p) && done < repeat_count ())
Rest_collision_engraver::Rest_collision_engraver ()
{
- rest_collision_ =0;
+ rest_collision_ = 0;
rest_count_ = 0;
}
rest_collision_ = make_item ("RestCollision", SCM_EOL);
- for (int i=0; i < note_columns_.size (); i++)
+ for (int i= 0; i < note_columns_.size (); i++)
Rest_collision::add_column (rest_collision_,note_columns_[i]);
}
*/
Rest_engraver::Rest_engraver ()
{
- rest_req_ =0;
- rest_ =0;
- dot_ =0;
+ rest_req_ = 0;
+ rest_ = 0;
+ dot_ = 0;
}
void
Rest_engraver::start_translation_timestep ()
{
- rest_req_ =0;
+ rest_req_ = 0;
}
void
Rest_engraver::stop_translation_timestep ()
{
- rest_ =0;
- dot_ =0;
+ rest_ = 0;
+ dot_ = 0;
}
void
Rhythmic_column_engraver::Rhythmic_column_engraver ()
{
- spacing_ =0 ;
+ spacing_ = 0 ;
last_spacing_ = 0;
- stem_ =0;
- note_column_=0;
- dotcol_ =0;
+ stem_ = 0;
+ note_column_= 0;
+ dotcol_ = 0;
}
}
- for (int i=0; i < rheads_.size (); i++)
+ for (int i= 0; i < rheads_.size (); i++)
{
if (!rheads_[i]->get_parent (X_AXIS))
Note_column::add_head (note_column_, rheads_[i]);
void
Rhythmic_column_engraver::stop_translation_timestep ()
{
- note_column_ =0;
+ note_column_ = 0;
if (spacing_)
{
last_spacing_ = spacing_;
- spacing_ =0;
+ spacing_ = 0;
}
- dotcol_ =0;
- stem_ =0;
+ dotcol_ = 0;
+ stem_ = 0;
}
Rod::Rod ()
{
distance_ = 0.0;
- item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
+ item_l_drul_[LEFT] = item_l_drul_[RIGHT] = 0;
}
*/
Score_engraver::Score_engraver ()
{
- system_ =0;
- command_column_ =0;
- musical_column_ =0;
- breaks_ =0;
+ system_ = 0;
+ command_column_ = 0;
+ musical_column_ = 0;
+ breaks_ = 0;
pscore_ = 0;
}
void
Score_engraver::typeset_all ()
{
- for (int i =0; i < elems_.size (); i++)
+ for (int i = 0; i < elems_.size (); i++)
{
Grob * elem = elems_[i];
Score_performer::get_output ()
{
Music_output * o = performance_;
- performance_ =0;
+ performance_ = 0;
return o;
}
Script_column_engraver::Script_column_engraver ()
{
- scol_ =0;
+ scol_ = 0;
}
void
Script_column_engraver::stop_translation_timestep ()
{
- scol_ =0;
+ scol_ = 0;
scripts_.clear ();
}
if (scol_)
{
- for (int i=0; i < scripts_.size (); i++)
+ for (int i= 0; i < scripts_.size (); i++)
Script_column::add_staff_sided (scol_, scripts_[i]);
scripts_.clear ();
}
{
sep_span_ = 0;
break_item_ = 0;
- musical_item_ =0;
+ musical_item_ = 0;
}
void
Grob *column = unsmob_grob (ccol);
sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
- sep_span_ =0;
+ sep_span_ = 0;
for (int i= 0 ; i < last_spacings_.note_spacings_.size (); i++)
{
{
if (break_item_)
context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
- break_item_ =0;
+ break_item_ = 0;
}
void
Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
}
- musical_item_ =0;
+ musical_item_ = 0;
}
else if (len.grace_part_ && !len.main_part_)
{
last_mom_ = here_mom_;
- here_mom_.grace_part_ =0;
+ here_mom_.grace_part_ = 0;
}
else
{
*/
active_count_ = 0;
force_ = 0.;
- indent_ =0.0;
+ indent_ = 0.0;
default_space_ = 20 PT;
}
Real
Simple_spacer::range_ideal_len (int l, int r) const
{
- Real d =0.;
+ Real d = 0.;
for (int i=l; i < r; i++)
d += springs_[i].ideal_;
return d;
Real
Simple_spacer::range_stiffness (int l, int r) const
{
- Real den =0.0;
+ Real den = 0.0;
for (int i=l; i < r; i++)
{
if (springs_[i].is_active_)
Simple_spacer::active_blocking_force () const
{
Real bf = - infinity_f;
- for (int i=0; i < springs_.size (); i++)
+ for (int i= 0; i < springs_.size (); i++)
if (springs_[i].is_active_)
{
bf = bf >? springs_[i].block_force_;
Real max_block_force = -infinity_f;
int max_i = -1;
- for (int i=0; i < springs_.size (); i++)
+ for (int i= 0; i < springs_.size (); i++)
{
if (springs_[i].block_force_ > max_block_force)
{
Simple_spacer::set_active_states ()
{
/* float comparison is safe, since force is only copied. */
- for (int i=0 ; i <springs_.size (); i++)
+ for (int i= 0 ; i <springs_.size (); i++)
if (springs_[i].is_active_
&& springs_[i].block_force_ >= force_)
{
Real
Simple_spacer::configuration_length () const
{
- Real l =0.;
- for (int i=0; i < springs_.size (); i++)
+ Real l = 0.;
+ for (int i= 0; i < springs_.size (); i++)
l += springs_[i].length (force_);
return l;
Spring_description::Spring_description ()
{
- ideal_ =0.0;
- hooke_ =0.0;
+ ideal_ = 0.0;
+ hooke_ = 0.0;
is_active_ = true;
block_force_ = 0.0;
}
fucked up wtk1-fugue2 (taking 3 full pages.)
*/
positions->config_.push (spacer_->indent_);
- for (int i=0; i < spacer_->springs_.size (); i++)
+ for (int i= 0; i < spacer_->springs_.size (); i++)
{
Real l = spacer_->springs_[i].length ((ragged) ? 0.0 : spacer_->force_);
positions->config_.push (positions->config_.top () + l);
}
spaced_cols_ = cols;
- for (int i=0; i < cols.size () - 1; i++)
+ for (int i= 0; i < cols.size () - 1; i++)
{
Spring_smob *spring = 0;
spacer_->add_spring (ideal, hooke);
}
- for (int i=0; i < cols.size () - 1; i++)
+ for (int i= 0; i < cols.size () - 1; i++)
{
for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
scm_is_pair (s); s = scm_cdr (s))
Music_iterator*
Simultaneous_music_iterator::try_music_in_children (Music *m) const
{
- Music_iterator * b=0;
+ Music_iterator * b= 0;
for (SCM s = children_list_; !b && scm_is_pair (s); s = scm_cdr (s))
b =unsmob_iterator (scm_car (s))->try_music (m);
return b;
Slash_repeat_engraver::Slash_repeat_engraver ()
{
- repeat_ =0;
+ repeat_ = 0;
beat_slash_ = 0;
}
{
Real x = state.encompass_infos_[j].x_;
- bool l_edge = j==0;
+ bool l_edge = j== 0;
bool r_edge = j==state.encompass_infos_.size ()-1;
bool edge = l_edge || r_edge;
if (!newline_locations_.size ())
return 1;
- int lo=0;
+ int lo= 0;
int hi = newline_locations_.size ();
if (newline_locations_[lo] > pos_str0)
Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
spacing_->set_bound (RIGHT, p);
- spacing_ =0;
+ spacing_ = 0;
}
}
{
Moment shortest_playing;
shortest_playing.set_infinite (1);
- for (int i=0; i < playing_durations_.size (); i++)
+ for (int i= 0; i < playing_durations_.size (); i++)
{
Music * mus = playing_durations_[i].info_.music_cause ();
if (mus)
Moment starter;
starter.set_infinite (1);
- for (int i=0; i < now_durations_.size (); i++)
+ for (int i= 0; i < now_durations_.size (); i++)
{
Moment m = now_durations_[i].info_.music_cause ()->get_length ();
if (m.to_bool ())
{
Link_array<Grob> newcols;
Real increment = robust_scm2double (me->get_property ("spacing-increment"), 1.2);
- for (int i=0; i < cols->size (); i++)
+ for (int i= 0; i < cols->size (); i++)
{
if (Item::is_breakable (cols->elem (i)) || Paper_column::is_musical (cols->elem (i)))
{
void
Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> cols)
{
- for (int i=0; i < cols.size (); i++)
+ for (int i= 0; i < cols.size (); i++)
{
SCM right_neighbors = SCM_EOL;
int min_rank = 100000; // inf.
Rational shortest_in_measure;
shortest_in_measure.set_infinite (1);
- for (int i =0 ; i < cols.size (); i++)
+ for (int i = 0 ; i < cols.size (); i++)
{
if (Paper_column::is_musical (cols[i]))
{
music. */
if (Note_spacing::has_interface (wish))
{
- Real space =0.0;
- Real fixed =0.0;
+ Real space = 0.0;
+ Real fixed = 0.0;
Note_spacing::get_spacing (wish, rc, base_note_space, increment, &space, &fixed);
we do this very late, to make sure we also catch `extra'
side-pos support like accidentals.
*/
- for (int i=0; i < arpeggios_.size (); i ++)
+ for (int i= 0; i < arpeggios_.size (); i ++)
{
for (SCM s = arpeggios_[i]->get_property ("stems");
scm_is_pair (s); s = scm_cdr (s))
Span_bar_engraver::Span_bar_engraver ()
{
- spanbar_ =0;
+ spanbar_ = 0;
}
void
{
if (spanbar_)
{
- for (int i=0; i < bars_.size () ; i++)
+ for (int i= 0; i < bars_.size () ; i++)
Span_bar::add_bar (spanbar_,bars_[i]);
SCM vissym =ly_symbol2scm ("break-visibility");
spanbar_->internal_set_property (vissym, vis);
- spanbar_ =0;
+ spanbar_ = 0;
}
bars_.set_size (0);
}
}
Moment start_mom = finished_dynamic_tuples_[0].mom_;
Moment dt = finished_dynamic_tuples_.top ().mom_ - start_mom;
- for (int i=0; i < finished_dynamic_tuples_.size (); i++)
+ for (int i= 0; i < finished_dynamic_tuples_.size (); i++)
{
Audio_dynamic_tuple* a = &finished_dynamic_tuples_[i];
Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_
: Grob (s, key)
{
break_index_ = 0;
- spanned_drul_[LEFT]=0;
- spanned_drul_[RIGHT]=0;
+ spanned_drul_[LEFT]= 0;
+ spanned_drul_[RIGHT]= 0;
Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("spanner-interface"));
}
Spanner::Spanner (Spanner const &s, int count)
: Grob (s, count)
{
- spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0;
+ spanned_drul_[LEFT] = spanned_drul_[RIGHT] = 0;
}
Real
Spring_smob::Spring_smob ()
{
- distance_ =0.;
+ distance_ = 0.;
strength_ =1.0;
expand_only_b_ = false;
other_ = 0;
Staff_spacing::next_notes_correction (Grob *me, Grob * last_grob)
{
Interval bar_size = bar_y_positions (last_grob);
- Real max_corr =0.0;
+ Real max_corr = 0.0;
for (SCM s = me->get_property ("right-items");
scm_is_pair (s); s = scm_cdr (s))
*space = 1.0;
*fixed = 1.0;
- Grob * separation_item=0;
+ Grob * separation_item= 0;
Item * me_item = dynamic_cast<Item*> (me);
for (SCM s = me->get_property ("left-items");
{
span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
}
- span_ =0;
+ span_ = 0;
}
void
if (init)
{
int k = scm_ilength (get_property ("stringTunings"));
- if (k>=0)
+ if (k>= 0)
span_->set_property ("line-count", scm_int2num (k));
}
}
t);
Stencil m;
- for (int i=0; i < l; i++)
+ for (int i= 0; i < l; i++)
{
Stencil b(a);
b.translate_axis (height - i * staff_space (me), Y_AXIS);
tremolo_ev_ = 0;
stem_ = 0;
tremolo_ = 0;
- rhythmic_ev_ =0;
+ rhythmic_ev_ = 0;
}
void
fixups must be done in broken line_of_scores, because new elements
are put over there. */
int count = 0;
- for (int i=0; i < broken_intos_.size (); i++)
+ for (int i= 0; i < broken_intos_.size (); i++)
{
Grob *se = broken_intos_[i];
SCM all = se->get_property ("all-elements");
Tab_note_heads_engraver::process_music ()
{
int j = 0;
- for (int i=0; i < note_events_.size (); i++)
+ for (int i= 0; i < note_events_.size (); i++)
{
SCM stringTunings = get_property ("stringTunings");
int number_of_strings = ((int) ly_length (stringTunings));
Item * note = make_item ("TabNoteHead", event->self_scm ());
- Music * tabstring_event=0;
+ Music * tabstring_event= 0;
for (SCM s =event->get_property ("articulations");
!tabstring_event && scm_is_pair (s); s = scm_cdr (s))
{
if (Rhythmic_head::has_interface (inf.grob_))
{
- for (int i=0; i < texts_.size (); i++)
+ for (int i= 0; i < texts_.size (); i++)
{
Grob*t = texts_[i];
Side_position_interface::add_support (t,inf.grob_);
if (Stem::has_interface (inf.grob_))
{
- for (int i=0; i < texts_.size (); i++)
+ for (int i= 0; i < texts_.size (); i++)
{
Side_position_interface::add_support (texts_[i],inf.grob_);
}
{
if (texts_.size ())
return;
- for (int i=0; i < evs_.size (); i++)
+ for (int i= 0; i < evs_.size (); i++)
{
Music * r = evs_[i];
{
finished_ = 0;
current_req_ = 0;
- span_ =0;
+ span_ = 0;
req_drul_[START] = 0;
req_drul_[STOP] = 0;
}
: input_ (name)
{
- for (int i=0; i < TFM_SIZE; i++)
+ for (int i= 0; i < TFM_SIZE; i++)
ascii_to_metric_idx_.push (-1);
read_header ();
if (ties_.size ())
{
heads_to_tie_.clear ();
- for (int i=0; i< ties_.size (); i++)
+ for (int i= 0; i< ties_.size (); i++)
{
typeset_tie (ties_[i]);
}
ties_.clear ();
last_event_ = 0;
- tie_column_ =0;
+ tie_column_ = 0;
}
if (event_)
{
SCM sm = get_property ("measurePosition");
- Moment m =0;
+ Moment m = 0;
if (unsmob_moment (sm))
{
m = *unsmob_moment (sm);
should delete these after exit.
*/
-Scheme_hash_table *global_translator_dict=0;
+Scheme_hash_table *global_translator_dict= 0;
LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0, (),
"Return a list of all translator objects that may be instantiated. "
{
must_be_last_ = false;
self_scm_ = SCM_EOL;
- daddy_context_ =0;
+ daddy_context_ = 0;
smobify_self ();
}
{
finished_ = 0;
current_req_ = 0;
- span_ =0;
+ span_ = 0;
req_drul_[START] = 0;
req_drul_[STOP] = 0;
}
if (bracket_visibility)
{
Real ss = Staff_symbol_referencer::staff_space (me);
- Real gap=0.;
+ Real gap= 0.;
if (!num.extent (X_AXIS).is_empty ())
gap = num.extent (X_AXIS).length () + 1.0;
{
if (Note_column::has_interface (i.grob_))
{
- for (int j =0; j < tuplets_.size (); j++)
+ for (int j = 0; j < tuplets_.size (); j++)
if (tuplets_[j].spanner_)
Tuplet_bracket::add_column (tuplets_[j].spanner_,
dynamic_cast<Item*> (i.grob_));
Vertical_align_engraver::Vertical_align_engraver ()
{
- valign_ =0;
+ valign_ = 0;
}
void
const char* cs = str.to_str0 ();
no_vertical_end |=
- (strcmp (cs,":|")!=0 && strcmp (cs,"|:")!=0 && strcmp (cs,"|.")!=0
- && strcmp (cs,":|:")!=0 && strcmp (cs,".|")!=0);
+ (strcmp (cs,":|")!= 0 && strcmp (cs,"|:")!= 0 && strcmp (cs,"|.")!= 0
+ && strcmp (cs,":|:")!= 0 && strcmp (cs,".|")!= 0);
Output_def * layout =me->get_layout ();
Real half_space = 0.5;
/*
not a start, but really broken in two
*/
- Real left =0.;
+ Real left = 0.;
if (bound->break_status_dir () == RIGHT)
{
Paper_column *pc = bound->get_column ();
else if (end)
{
end_volta_span_ = volta_span_;
- volta_span_ =0;
+ volta_span_ = 0;
}
if (volta_span_ &&
end_volta_span_->set_bound (RIGHT, ci);
}
- end_volta_span_ =0;
+ end_volta_span_ = 0;
if (volta_span_ && !volta_span_->get_bound (LEFT))
{
projects / lilypond.git / commitdiff