create_grobs () to process_acknowledged_grobs().
* lily/engraver-group-engraver.cc (do_announces): scary change in
calling convention of create_grobs(): no create_grobs() call
before acknowledge_grobs().
2002-06-19 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * lily/engraver-group-engraver.cc (do_announces): rename
+ create_grobs () to process_acknowledged_grobs().
+
* lily/grob.cc (programming_error): add programming_error with
origin location.
R1*8 |
R1*9 |
R1*10 |
-R1*11 |
+R1*11 |
}
\score { < \context Staff \thenotes
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
private:
Item* text_p_;
}
void
-A2_engraver::create_grobs ()
+A2_engraver::process_acknowledged_grobs ()
{
if (!to_boolean (get_property ("combineParts")))
return ;
virtual void acknowledge_grob (Grob_info);
virtual void stop_translation_timestep ();
virtual void initialize ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void finalize ();
public:
}
void
-Accidental_engraver::create_grobs ()
+Accidental_engraver::process_acknowledged_grobs ()
{
if (accidental_arr_.size () && !accidental_arr_.top().done_)
{
virtual void start_translation_timestep ();
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
private:
bool test_moment (Direction, Moment);
}
void
-Auto_beam_engraver::create_grobs ()
+Auto_beam_engraver::process_acknowledged_grobs ()
{
if (!count_i_)
{
virtual void initialize ();
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual Spanner* get_spanner_p () const;
virtual void add_element (Grob*) ;
public:
cyclic parent relationship if we have two Axis_group_engravers in
the context. */
void
-Axis_group_engraver::create_grobs ()
+Axis_group_engraver::process_acknowledged_grobs ()
{
/* UGH UGH UGH */
for (int i=0; i < elts_.size (); i++)
protected:
virtual void finalize ();
virtual void stop_translation_timestep ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
private:
void typeset_bar ();
if (!bar_p_)
{
bar_p_ = new Item (get_property ("BarLine"));
-
SCM gl = get_property ("whichBar");
if (scm_equal_p (gl, bar_p_->get_grob_property ("glyph")) != SCM_BOOL_T)
bar_p_->set_grob_property ("glyph", gl);
/*
Bar_engraver should come *after* any engravers that
modify whichBar
+
+ This is a little hairy : whichBar may be set by
+ Repeat_acknowledge_engraver::process_music, which is at score
+ context. This means that grobs could should be created after
+ process_music. We do stuff process_acknowledged_grobs(), just to be
+ on the safe side.
+
*/
+
void
-Bar_engraver::create_grobs ()
+Bar_engraver::process_acknowledged_grobs ()
{
if (!bar_p_ && gh_string_p (get_property ("whichBar")))
{
protected:
virtual bool try_music (Music *req_l);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
}
void
-Breathing_sign_engraver::create_grobs ()
+Breathing_sign_engraver::process_acknowledged_grobs ()
{
if (breathing_sign_req_l_ && ! breathing_sign_p_)
{
protected:
virtual void stop_translation_timestep ();
virtual void acknowledge_grob (Grob_info i);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual bool try_music (Music *);
private:
}
void
-Chord_name_engraver::create_grobs ()
+Chord_name_engraver::process_acknowledged_grobs ()
{
if (!chord_name_p_ && ly_car (chord_) != SCM_EOL)
{
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
public:
TRANSLATOR_DECLARATIONS(Collision_engraver);
void
-Collision_engraver::create_grobs ()
+Collision_engraver::process_acknowledged_grobs ()
{
if (col_p_ || note_column_l_arr_.size () < 2)
return ;
TRANSLATOR_DECLARATIONS( Custos_engraver);
virtual void start_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
virtual void finalize ();
}
void
-Custos_engraver::create_grobs ()
+Custos_engraver::process_acknowledged_grobs ()
{
if (gh_string_p (get_property ("whichBar")))
custos_permitted = true;
void
-Engraver_group_engraver::create_grobs_in_simple_children ()
+Engraver_group_engraver::process_acknowledged_grobs_in_simple_children ()
{
for (SCM p = simple_trans_list_; gh_pair_p (p); p = ly_cdr (p))
{
Translator * t = unsmob_translator (ly_car (p));
Engraver * eng = dynamic_cast<Engraver*> (t);
if (eng)
- eng->create_grobs ();
+ eng->process_acknowledged_grobs ();
}
}
dynamic_cast<Engraver_group_engraver*> (t)->do_announces ();
}
- // create_grobs_in_simple_children ();
+ process_acknowledged_grobs_in_simple_children ();
- while (announce_info_arr_.size ())
+ do
{
acknowledge_grobs ();
announce_info_arr_.clear ();
- create_grobs_in_simple_children ();
+ process_acknowledged_grobs_in_simple_children ();
}
+ while (announce_info_arr_.size ());
}
virtual bool try_music (Music*);
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
private:
};
}
void
-Hyphen_engraver::create_grobs ()
+Hyphen_engraver::process_acknowledged_grobs ()
{
if (req_l_ &&! hyphen_p_)
{
virtual void process_music ();
private:
virtual void acknowledge_grobs ();
- virtual void create_grobs_in_simple_children ();
+ virtual void process_acknowledged_grobs_in_simple_children ();
};
#endif // ENGRAVERGROUP_HH
be looped with acknowledge_grob.
*/
- virtual void create_grobs () {}
+ virtual void process_acknowledged_grobs () {}
/**
Announce element. Default: pass on to daddy. Utility
*/
{
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
virtual void finalize ();
private:
protected:
virtual void stop_translation_timestep ();
virtual bool try_music (Music *);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void start_translation_timestep ();
public:
}
void
-Lyric_engraver::create_grobs ()
+Lyric_engraver::process_acknowledged_grobs ()
{
if (req_l_)
{
void
-Lyric_phrasing_engraver::create_grobs ()
+Lyric_phrasing_engraver::process_acknowledged_grobs ()
{
SCM p = get_property ("automaticPhrasing");
if (!to_boolean (p))
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
virtual bool try_music (Music *);
void
-Note_head_line_engraver::create_grobs ()
+Note_head_line_engraver::process_acknowledged_grobs ()
{
if (!line_ && (follow_ || last_req_) && last_head_ && head_
&& (last_head_ != head_))
Link_array<Note_req> req_l_arr_;
Link_array<Item> texts_;
virtual bool try_music (Music*m);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
};
}
void
-Note_name_engraver::create_grobs ()
+Note_name_engraver::process_acknowledged_grobs ()
{
if (texts_.size ())
return;
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
virtual void finalize ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
public:
TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver);
}
void
-Phrasing_slur_engraver::create_grobs ()
+Phrasing_slur_engraver::process_acknowledged_grobs ()
{
Link_array<Grob> start_phrasing_slur_l_arr;
for (int i=0; i< new_phrasing_slur_req_l_arr_.size (); i++)
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
private:
}
void
-Piano_pedal_engraver::create_grobs ()
+Piano_pedal_engraver::process_acknowledged_grobs ()
{
for (Pedal_info*p = info_list_; p && p->name_; p ++)
{
protected:
virtual bool try_music (Music *req_l);
virtual void process_music ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
}
void
-Porrectus_engraver::create_grobs ()
+Porrectus_engraver::process_acknowledged_grobs ()
{
if (porrectus_req_l_)
{
Link_array<Grob> note_column_l_arr_;
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
public:
TRANSLATOR_DECLARATIONS(Rest_collision_engraver);
}
void
-Rest_collision_engraver::create_grobs ()
+Rest_collision_engraver::process_acknowledged_grobs ()
{
if (rest_collision_p_ || note_column_l_arr_.size () < 2)
return;
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
};
void
-Rhythmic_column_engraver::create_grobs ()
+Rhythmic_column_engraver::process_acknowledged_grobs ()
{
if (rhead_l_arr_.size ())
{
TRANSLATOR_DECLARATIONS(Script_column_engraver);
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
};
}
void
-Script_column_engraver::create_grobs ()
+Script_column_engraver::process_acknowledged_grobs ()
{
if (!scol_p_ && script_l_arr_.size () > 1)
{
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
virtual void finalize ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
public:
TRANSLATOR_DECLARATIONS(Slur_engraver);
}
void
-Slur_engraver::create_grobs ()
+Slur_engraver::process_acknowledged_grobs ()
{
Link_array<Grob> start_slur_l_arr;
for (int i=0; i< new_slur_req_l_arr_.size (); i++)
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void stop_translation_timestep ();
private:
}
void
-Span_arpeggio_engraver::create_grobs ()
+Span_arpeggio_engraver::process_acknowledged_grobs ()
{
/*
connectArpeggios is slightly brusque; we should really read a elt
virtual bool try_music (Music* m);
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
virtual void acknowledge_grob (Grob_info);
};
}
void
-Text_engraver::create_grobs ()
+Text_engraver::process_acknowledged_grobs ()
{
if (texts_.size ())
return;
virtual bool try_music (Music *);
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
private:
Spanner *span_;
}
void
-Text_spanner_engraver::create_grobs ()
+Text_spanner_engraver::process_acknowledged_grobs ()
{
if (req_drul_[STOP])
{
virtual void stop_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
virtual bool try_music (Music*);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
void typeset_tie (Grob*);
public:
TRANSLATOR_DECLARATIONS(Tie_engraver);
}
void
-Tie_engraver::create_grobs ()
+Tie_engraver::process_acknowledged_grobs ()
{
if (req_l_)
{
virtual void acknowledge_grob (Grob_info);
virtual bool try_music (Music*r);
virtual void start_translation_timestep ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
};
bool
}
void
-Tuplet_engraver::create_grobs ()
+Tuplet_engraver::process_acknowledged_grobs ()
{
SCM v = get_property ("tupletInvisible");
if (to_boolean (v))
virtual void finalize ();
virtual void stop_translation_timestep ();
virtual void process_music ();
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
Moment started_mom_;
Spanner *volta_span_p_;
this could just as well be done in process_music (), but what the hack.
*/
void
-Volta_engraver::create_grobs ()
+Volta_engraver::process_acknowledged_grobs ()
{
if (!volta_span_p_ && gh_string_p (start_str_))
{