X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=ce462e85cbc42a68938b82e0a59c541268255495;hb=f84fa056117227739b77c1c50efc06e6ef4f32da;hp=343b02a4b75725ab5be7cd96d237c5a0978a7bb4;hpb=c896840a71d1e5e644d4258fe70e986d0cb5ec0a;p=lilypond.git diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index 343b02a4b7..ce462e85cb 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ -#ifndef SCORE_GRAV_HH -#define SCORE_GRAV_HH +#ifndef SCORE_ENGRAVER_HH +#define SCORE_ENGRAVER_HH #include "engraver-group-engraver.hh" #include "global-translator.hh" @@ -19,30 +19,30 @@ class Score_engraver : public Engraver_group_engraver, public Global_translator { - System * scoreline_l_; - int breaks_i_; + System *system_; + int breaks_; - Link_array elem_p_arr_; + Link_array elems_; - Paper_column* command_column_l_; - Paper_column* musical_column_l_; + Paper_column* command_column_; + Paper_column* musical_column_; void make_columns (); void set_columns (Paper_column*,Paper_column*); void typeset_all (); public: TRANSLATOR_DECLARATIONS(Score_engraver); - Paper_score * pscore_p_; + Paper_score * pscore_; void forbid_breaks (); - virtual Music_output *get_output_p (); + virtual Music_output *get_output (); protected: virtual void prepare (Moment); virtual void finish (); virtual void one_time_step (); - virtual int depth_i () const { return Global_translator::depth_i ();} + virtual int get_depth () const { return Global_translator::get_depth ();} protected: /* Engraver_group_engraver interface */ @@ -52,9 +52,9 @@ protected: virtual void initialize (); virtual void finalize (); virtual void announce_grob (Grob_info); - virtual void typeset_grob (Grob*elem_p); + virtual void typeset_grob (Grob*elem); virtual void stop_translation_timestep (); }; -#endif // SCORE_GRAV_HH +#endif /* SCORE_ENGRAVER_HH */