From: Han-Wen Nienhuys Date: Sun, 9 May 2004 16:01:06 +0000 (+0000) Subject: remove X-Git-Tag: release/2.3.2~25 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1855cf7137149c0bd27b5851fd9db498385591b3;p=lilypond.git remove {Engraver,Score_engraver}::typeset_grob(), remove all calls. --- diff --git a/ChangeLog b/ChangeLog index a4c6f54b36..c45953b5ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-09 Han-Wen Nienhuys + + * lily/score-engraver.cc: remove + {Engraver,Score_engraver}::typeset_grob(), remove all calls. + 2004-05-09 Jan Nieuwenhuizen * input/test/markup-score.ly: Remove \notes. diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 379e6629aa..7959ff7054 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -23,13 +23,9 @@ here is the new implementation @code{\applymusic}, @item @code{\apply} has been renamed to @code{\applymusic}. @item Music can be used as a markup. -When inserting a @code{\score} block as part of a @code{\markup}, it -produces a rendered markup of the music. - -@example -@c TODO, see input/test/markup-score.ly -@end example - +When inserting a @code{score} block as part of a @code{\markup}, it +produces a rendered markup of the music. An example is in +@file{input/test/markup-score.ly}. @item LilyPond expressions can be embedded into Scheme. The syntax for this is @code{#@{ ... #@}}. Within such a block, Scheme forms can be @@ -806,7 +802,7 @@ for chords, and for simultaneous music. To convert your files from to <>, use the script -included in buildscripts/convert-new-chords.py +included in @file{buildscripts/convert-new-chords.py}. This change was introduced for the following reasons diff --git a/VERSION b/VERSION index 7daa5baee8..86236c9b82 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=3 -PATCH_LEVEL=1 +PATCH_LEVEL=2 MY_PATCH_LEVEL= diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 808c2408ec..735e9ff831 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -415,14 +415,6 @@ Accidental_engraver::stop_translation_timestep () } } - for (int i = 0; i < accidentals_.size (); i++) - { - if (Grob *a = accidentals_[i].accidental_) - typeset_grob (a); - } - - if (accidental_placement_) - typeset_grob (accidental_placement_); accidental_placement_ = 0; diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index 5d283d265d..e0328567f8 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -130,7 +130,7 @@ Ambitus_engraver::stop_translation_timestep () SCM key_signature = get_property ("keySignature"); ambitus_->set_property ("accidentals", key_signature); - typeset_grob (ambitus_); + is_typeset = true; } } diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index 282a7653a0..261ff66f51 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -88,11 +88,7 @@ Arpeggio_engraver::process_music () void Arpeggio_engraver::stop_translation_timestep () { - if (arpeggio_) - { - typeset_grob (arpeggio_); - arpeggio_ = 0; - } + arpeggio_ = 0; arpeggio_req_ = 0; } diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 65e8f86317..cbeba2f434 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -351,7 +351,6 @@ Auto_beam_engraver::typeset_beam () { finished_grouping_->beamify (beat_length_, subdivide_beams_); Beam::set_beaming (finished_beam_, finished_grouping_); - typeset_grob (finished_beam_); finished_beam_ = 0; delete finished_grouping_; diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 1bc232f4c5..f62de7f1de 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -85,7 +85,6 @@ Axis_group_engraver::finalize () staffline_->set_bound (RIGHT,it); - typeset_grob (staffline_); staffline_ = 0; } diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 7b9841bcab..78008a625f 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -84,11 +84,7 @@ Bar_engraver::process_acknowledged_grobs () void Bar_engraver::typeset_bar () { - if (bar_) - { - typeset_grob (bar_); bar_ =0; - } } /* diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 1b621c5382..4328e81a91 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -96,7 +96,7 @@ Bar_number_engraver::stop_translation_timestep () if (text_) { text_->set_property ("side-support-elements", get_property ("stavesFound")); - typeset_grob (text_); + text_ =0; } } diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 2abec27aec..4e6238bedf 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -164,7 +164,7 @@ Beam_engraver::typeset_beam () { finished_beam_info_->beamify (beat_length_, subdivide_beams_); Beam::set_beaming (finished_beam_, finished_beam_info_); - typeset_grob (finished_beam_); + delete finished_beam_info_; finished_beam_info_ =0; finished_beam_ = 0; diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 08fc9d6ef1..9c830d3fce 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -37,7 +37,7 @@ Break_align_engraver::add_column (SCM smob) { Grob * e = unsmob_grob (smob); Break_align_interface::add_element (align_,e); - typeset_grob (e); + } void @@ -56,16 +56,8 @@ Break_align_engraver::stop_translation_timestep () } column_alist_ = SCM_EOL; - if (align_) - { - typeset_grob (align_); - align_ = 0; - } - if (left_edge_) - { - typeset_grob (left_edge_); - left_edge_ = 0; - } + align_ = 0; + left_edge_ = 0; } diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index d39fa93984..10074de3f6 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -62,11 +62,7 @@ Breathing_sign_engraver::process_acknowledged_grobs () void Breathing_sign_engraver::stop_translation_timestep () { - if (breathing_sign_) - { - typeset_grob (breathing_sign_); - breathing_sign_ = 0; - } + breathing_sign_ = 0; breathing_sign_req_ = 0; } diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index e6b70aa402..252dfb8743 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -137,10 +137,6 @@ Chord_name_engraver::try_music (Music* m) void Chord_name_engraver::stop_translation_timestep () { - if (chord_name_) - { - typeset_grob (chord_name_); - } chord_name_ = 0; notes_.clear (); } diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 39871f741d..7048eb41c8 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,11 +1,11 @@ /* - new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver + new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver - source file of the GNU LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 2000--2004 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys - */ +*/ #include "engraver.hh" #include "beam.hh" @@ -26,17 +26,17 @@ /** - This acknowledges repeated music with "tremolo" style. It typesets - a beam. +This acknowledges repeated music with "tremolo" style. It typesets +a beam. - TODO: +TODO: - - perhaps use engraver this to steer other engravers? That would - create dependencies between engravers, which is bad. +- perhaps use engraver this to steer other engravers? That would +create dependencies between engravers, which is bad. - - create dots if appropriate. +- create dots if appropriate. - - create TremoloBeam iso Beam? +- create TremoloBeam iso Beam? */ class Chord_tremolo_engraver : public Engraver @@ -145,11 +145,7 @@ Chord_tremolo_engraver::finalize () void Chord_tremolo_engraver::typeset_beam () { - if (finished_beam_) - { - typeset_grob (finished_beam_); - finished_beam_ = 0; - } + finished_beam_ = 0; } void @@ -212,11 +208,7 @@ Chord_tremolo_engraver::stop_translation_timestep () { typeset_beam (); - if (stem_tremolo_) - { - typeset_grob (stem_tremolo_); - stem_tremolo_ = 0; - } + stem_tremolo_ = 0; } diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 78405680cc..fb5daa0402 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -179,14 +179,8 @@ Clef_engraver::stop_translation_timestep () } } - typeset_grob (clef_); clef_ =0; - if (octavate_) - { - typeset_grob (octavate_); - } - octavate_ = 0; } } diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc index 23795e56bd..a65ee86cbf 100644 --- a/lily/cluster-engraver.cc +++ b/lily/cluster-engraver.cc @@ -51,17 +51,8 @@ Cluster_spanner_engraver::finalize () void Cluster_spanner_engraver::typeset_grobs () { - if (finished_spanner_ ) - { - typeset_grob (finished_spanner_); - finished_spanner_ = 0; - } - - if (beacon_) - { - typeset_grob (beacon_); - beacon_ = 0; - } + finished_spanner_ = 0; + beacon_ = 0; } bool diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index b015a6255e..3e7e6b45eb 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -211,12 +211,6 @@ Coherent_ligature_engraver::typeset_ligature (Spanner *ligature, // prepare ligature for typesetting build_ligature (ligature, primitives); collect_accidentals (ligature, primitives); - - // now actually typeset - for (int i = 0; i < primitives.size (); i++) - { - typeset_grob (primitives[i].grob_); - } } ENTER_DESCRIPTION (Coherent_ligature_engraver, diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 478030d847..c468b61061 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -60,11 +60,7 @@ Collision_engraver::acknowledge_grob (Grob_info i) void Collision_engraver::stop_translation_timestep () { - if (col_) - { - typeset_grob (col_); - col_ =0; - } + col_ =0; note_columns_.clear (); } diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 229eadd493..73d3473a89 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -281,22 +281,12 @@ Completion_heads_engraver::process_music () void Completion_heads_engraver::stop_translation_timestep () { - for (int i = ties_.size (); i--;) - typeset_grob (ties_[i]); ties_.clear (); - for (int i=0; i < notes_.size (); i++) - { - typeset_grob (notes_[i]); - } if (notes_.size ()) prev_notes_ = notes_; notes_.clear (); - for (int i=0; i < dots_.size (); i++) - { - typeset_grob (dots_[i]); - } dots_.clear (); for (int i = scratch_note_reqs_.size (); i--;) diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index 09d0ec9aa6..40b2941c07 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -51,10 +51,6 @@ Custos_engraver::stop_translation_timestep () /* delay typeset until we're at the next moment, so we can silence custodes at the end of the piece. */ - for (int i = custodes_.size (); i--;) - { - typeset_grob (custodes_[i]); - } pitches_.clear (); custos_permitted = false; @@ -138,7 +134,6 @@ Custos_engraver::finalize () for (int i = custodes_.size (); i--;) { custodes_[i]->suicide (); - typeset_grob (custodes_[i]); } custodes_.clear (); } diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index 2b426cec2c..141f2cfec6 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -37,20 +37,15 @@ Dot_column_engraver::Dot_column_engraver () void Dot_column_engraver::stop_translation_timestep () { - if (dotcol_) - { - /* Add the stem to the support so dots stay clear of flags. See [Ross, p 171] */ - if (stem_) + if (stem_ && dotcol_) dotcol_->set_property ("stem", stem_->self_scm ()); - typeset_grob (dotcol_); dotcol_ =0; - } heads_.clear (); stem_ =0; } diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index 8b05bad665..a668d3408b 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -162,20 +162,8 @@ Drum_notes_engraver::acknowledge_grob (Grob_info inf) void Drum_notes_engraver::stop_translation_timestep () { - for (int i=0; i < notes_.size (); i++) - { - typeset_grob (notes_[i]); - } notes_.clear (); - for (int i=0; i < dots_.size (); i++) - { - typeset_grob (dots_[i]); - } dots_.clear (); - for (int i=0; i < scripts_.size (); i++) - { - typeset_grob (scripts_[i]); - } scripts_.clear (); events_.clear (); diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index f57f031e28..31368b175c 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -333,15 +333,10 @@ Dynamic_engraver::typeset_all () add_bound_item (finished_line_spanner_, finished_cresc_->get_bound (RIGHT)); } - typeset_grob (finished_cresc_); finished_cresc_ =0; } - if (script_) - { - typeset_grob (script_); script_ = 0; - } if (finished_line_spanner_) { /* @@ -373,7 +368,6 @@ Dynamic_engraver::typeset_all () finished_line_spanner_->set_bound (LEFT, ci); } - typeset_grob (finished_line_spanner_); finished_line_spanner_ = 0; } } diff --git a/lily/engraver.cc b/lily/engraver.cc index fa2e68479a..5f83295e18 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -52,13 +52,6 @@ Engraver::announce_grob (Grob* e, SCM cause) -void -Engraver::typeset_grob (Grob*p) -{ - Engraver *dad = get_daddy_engraver (); - if (dad) - dad->typeset_grob (p); -} Engraver::Engraver () diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 35f4db9218..f2f9d67614 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -85,7 +85,6 @@ Extender_engraver::stop_translation_timestep () { if (pending_extender_ && pending_extender_->get_bound (RIGHT)) { - typeset_grob (pending_extender_); pending_extender_ = 0; } @@ -140,7 +139,6 @@ Extender_engraver::finalize () if (!extender_->get_bound (RIGHT)) extender_->warning (_ ("unterminated extender")); - typeset_grob (extender_); extender_ = 0; } @@ -150,7 +148,6 @@ Extender_engraver::finalize () if (!pending_extender_->get_bound (RIGHT)) pending_extender_->warning (_("unterminated extender")); - typeset_grob (pending_extender_); pending_extender_ =0; } } diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index f46a86b671..2368748c2a 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -37,11 +37,7 @@ Figured_bass_engraver::Figured_bass_engraver () void Figured_bass_engraver::stop_translation_timestep () { - if (figure_) - { - typeset_grob (figure_); - figure_ = 0; - } + figure_ = 0; figures_.clear (); rest_req_ = 0; diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index c61ba4c56a..8dbc974b6f 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -134,11 +134,6 @@ Fingering_engraver::stop_translation_timestep () if (!fingerings_.size ()) return; - for (int i=0; i < fingerings_.size (); i++) - { - Item *ti = fingerings_[i]; - typeset_grob (ti); - } fingerings_.clear (); } diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 6c177c43ba..884f5e3665 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -80,7 +80,6 @@ Glissando_engraver::stop_translation_timestep () { if (last_line_ && last_line_->get_bound (RIGHT)) { - typeset_grob (last_line_); last_line_ =0; } if (line_) diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc index 3be6afc743..494a90bc50 100644 --- a/lily/horizontal-bracket-engraver.cc +++ b/lily/horizontal-bracket-engraver.cc @@ -111,7 +111,7 @@ Horizontal_bracket_engraver::stop_translation_timestep () for (int i = pop_count_; i--;) { if (bracket_stack_.size ()) - typeset_grob (bracket_stack_.pop ()); + bracket_stack_.pop (); } pop_count_ = 0; push_count_ = 0; diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index edc3b5f36b..727a657606 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -97,7 +97,6 @@ Hyphen_engraver::finalize () hyphen_->suicide (); } - typeset_grob (hyphen_); hyphen_ = 0; } @@ -110,7 +109,6 @@ Hyphen_engraver::finalize () finished_hyphen_->warning (_("unterminated hyphen; removing")); finished_hyphen_->suicide (); } - typeset_grob (finished_hyphen_); finished_hyphen_ =0; } } @@ -131,14 +129,12 @@ Hyphen_engraver::stop_translation_timestep () { if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT)) { - typeset_grob (finished_hyphen_); finished_hyphen_ = 0; } if (finished_hyphen_ && hyphen_) { programming_error ("Haven't finished hyphen yet."); - typeset_grob (finished_hyphen_); finished_hyphen_ =0; } diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index c8270be6d6..1535a245cc 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -25,10 +25,6 @@ class Engraver : public virtual Translator { friend class Engraver_group_engraver; protected: - /* - Call this when you're finished with ELEM_P. - */ - virtual void typeset_grob (Grob*elem); /* take note of item/spanner put item in spanner. Adjust local key; etc. diff --git a/lily/include/line-group-group-engraver.hh b/lily/include/line-group-group-engraver.hh index d8a3fc0603..c2409b81c1 100644 --- a/lily/include/line-group-group-engraver.hh +++ b/lily/include/line-group-group-engraver.hh @@ -26,7 +26,6 @@ protected: virtual void create_line_spanner (); virtual void initialize (); virtual void finalize (); - virtual void typeset_grob (Grob*); public: TRANSLATOR_DECLARATIONS(Line_group_engraver_group); }; diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index bb9af2f5a4..a58b2b6efd 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -39,7 +39,6 @@ protected: virtual void initialize (); virtual void finalize (); virtual void announce_grob (Grob_info); - virtual void typeset_grob (Grob*elem); virtual void stop_translation_timestep (); public: diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 1abbcb859a..c99b6f5c77 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -52,7 +52,6 @@ Instrument_name_engraver::stop_translation_timestep () { text_->set_property ("side-support-elements", get_property ("instrumentSupport")); - typeset_grob (text_); text_ = 0; } } diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index fdb59dc492..2007350427 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -135,11 +135,7 @@ Key_engraver::process_music () void Key_engraver::stop_translation_timestep () { - if (item_) - { - typeset_grob (item_); item_ = 0; - } } diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc index 1837911cbf..0a32c30400 100644 --- a/lily/ligature-bracket-engraver.cc +++ b/lily/ligature-bracket-engraver.cc @@ -22,13 +22,8 @@ class Ligature_bracket_engraver : public Ligature_engraver protected: virtual Spanner *create_ligature_spanner (); virtual void acknowledge_grob (Grob_info); - virtual void typeset_ligature (Spanner *ligature, Array); - public: TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver); - -private: - void typeset_ligature_bracket (); }; @@ -42,11 +37,6 @@ Ligature_bracket_engraver::create_ligature_spanner () return make_spanner ("LigatureBracket", SCM_EOL); } -void -Ligature_bracket_engraver::typeset_ligature (Spanner *ligature, Array) -{ - typeset_grob (ligature); -} void Ligature_bracket_engraver::acknowledge_grob (Grob_info info) diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 45c838c53c..d9e68dbf6a 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -141,7 +141,6 @@ Lyric_engraver::stop_translation_timestep () } } - typeset_grob (text_); text_ =0; } event_ =0; diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index d552496872..fc09cde8ba 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -69,7 +69,6 @@ Mark_engraver::stop_translation_timestep () { SCM lst = get_property ("stavesFound"); text_->set_property ("side-support-elements" , lst); - typeset_grob (text_); text_ =0; } mark_ev_ = 0; diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index 6e54748f85..7c262c33eb 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -32,7 +32,6 @@ Measure_grouping_engraver::finalize () if (grouping_) { grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); - typeset_grob (grouping_); grouping_->suicide (); grouping_= 0; } @@ -56,7 +55,7 @@ Measure_grouping_engraver::process_music () { grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); - typeset_grob (grouping_); + grouping_ = 0; } diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 704707b3fb..2f0cdf5804 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -66,7 +66,7 @@ Metronome_mark_engraver::stop_translation_timestep () text_->set_parent (bar_line_, X_AXIS); text_->set_property ("side-support-elements" , get_property ("stavesFound")); - typeset_grob (text_); + text_ =0; } mark_ev_ = 0; diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 97a022230d..5f2314ce08 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -179,35 +179,8 @@ Multi_measure_rest_engraver::stop_translation_timestep () SCM smp = get_property ("measurePosition"); Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - if (mmrest_ - && !mp.to_bool () - && mmrest_->get_bound (LEFT) && mmrest_->get_bound (RIGHT)) - { - typeset_grob (mmrest_); - for (int i = 0 ; i < numbers_.size (); i++) - { - typeset_grob (numbers_[i]); - } - - /* - we must keep mmrest_ around to set measure-count, so - no mmrest_ = 0 here. - */ - } - if (last_rest_) { - /* sanity check */ - if (last_rest_->get_bound (LEFT) && last_rest_->get_bound (RIGHT) - && last_rest_->get_bound (LEFT) != last_rest_->get_bound (RIGHT)) - { - typeset_grob (last_rest_); - - for (int i = 0; i < last_numbers_.size ();i++) - { - typeset_grob (last_numbers_[i]); - } - } last_rest_ = 0; last_numbers_.clear (); } @@ -280,21 +253,6 @@ Multi_measure_rest_engraver::start_translation_timestep () void Multi_measure_rest_engraver::finalize () { - if (mmrest_) - { - typeset_grob (mmrest_); - } - if (last_rest_) - { - typeset_grob (last_rest_); - } - - for (int i = 0; i < last_numbers_.size ();i++) - typeset_grob (last_numbers_[i]); - - for (int i = 0; i < numbers_.size ();i++) - typeset_grob (numbers_[i]); - } ENTER_DESCRIPTION (Multi_measure_rest_engraver, diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index f867908ea5..c9a359e9a4 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -246,7 +246,6 @@ New_fingering_engraver::position_scripts () f->add_offset_callback (Side_position_interface::aligned_side_proc, X_AXIS); f->set_property ("direction", scm_int2num (hordir)); - typeset_grob (f); } int finger_prio = 200; @@ -263,7 +262,6 @@ New_fingering_engraver::position_scripts () f->set_property ("direction", scm_int2num (UP)); - typeset_grob (f); } for (int i = 0; i < down.size (); i++) @@ -278,7 +276,6 @@ New_fingering_engraver::position_scripts () f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS); f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS); f->set_property ("direction", scm_int2num (DOWN)); - typeset_grob (f); } } @@ -307,7 +304,6 @@ New_fingering_engraver::stop_translation_timestep () sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS); sc->set_property ("staff-padding" , SCM_EOL); } - typeset_grob (sc); } stem_ = 0; diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index f5737a795d..b489af8b14 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -100,11 +100,7 @@ Note_head_line_engraver::process_acknowledged_grobs () void Note_head_line_engraver::stop_translation_timestep () { - if (line_) - { - typeset_grob (line_); - line_ = 0; - } + line_ = 0; if (head_) last_head_ = head_; head_ = 0; diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 2cefa7b2be..12398fc068 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -93,16 +93,8 @@ Note_heads_engraver::process_music () void Note_heads_engraver::stop_translation_timestep () { - for (int i=0; i < notes_.size (); i++) - { - typeset_grob (notes_[i]); - } notes_.clear (); - for (int i=0; i < dots_.size (); i++) - { - typeset_grob (dots_[i]); - } dots_.clear (); note_reqs_.clear (); } diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index b9e82ab322..94841f7481 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -60,10 +60,6 @@ Note_name_engraver::process_music () void Note_name_engraver::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - typeset_grob (texts_[i]); - } texts_.clear () ; events_.clear (); } diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 895fa82660..49c2b56015 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -91,7 +91,6 @@ Ottava_spanner_engraver::typeset_all () } while (flip (&d) != LEFT); - typeset_grob (finished_); finished_ = 0; } } diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index daaf17b7c5..b548ca97fd 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -90,11 +90,7 @@ Part_combine_engraver::acknowledge_grob (Grob_info i) void Part_combine_engraver::stop_translation_timestep () { - if (text_) - { - typeset_grob (text_); text_ = 0; - } event_ = 0; } diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index f8d157abc6..dff15eec7b 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -170,15 +170,10 @@ Percent_repeat_engraver::typeset_perc () { SCM col =get_property ("currentCommandColumn"); finished_perc_->set_bound (RIGHT, unsmob_grob (col)); - typeset_grob (finished_perc_); finished_perc_ = 0; } - if (double_percent_) - { - typeset_grob (double_percent_); - double_percent_ = 0; - } + double_percent_ = 0; } diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 1671f24127..e3e289ce38 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -153,10 +153,6 @@ Phrasing_slur_engraver::process_acknowledged_grobs () void Phrasing_slur_engraver::stop_translation_timestep () { - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - { - typeset_grob (end_phrasing_slurs_[i]); - } end_phrasing_slurs_.clear (); } diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 7038355ee5..ef38347096 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -509,7 +509,6 @@ Piano_pedal_engraver::typeset_all (Pedal_info * p) if (p->item_) { - typeset_grob (p->item_); p->item_ = 0; } @@ -521,9 +520,7 @@ Piano_pedal_engraver::typeset_all (Pedal_info * p) p->finished_bracket_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); } - typeset_grob (p->finished_bracket_); - - p->finished_bracket_ =0; + p->finished_bracket_ = 0; } if (p->finished_line_spanner_) @@ -541,7 +538,7 @@ Piano_pedal_engraver::typeset_all (Pedal_info * p) p->finished_line_spanner_->set_bound (RIGHT, ci); p->finished_line_spanner_->set_bound (LEFT, ci); } - typeset_grob (p->finished_line_spanner_); + p->finished_line_spanner_ = 0; } } diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index e63fc171b0..7af8ad7a73 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -61,11 +61,7 @@ Rest_collision_engraver::acknowledge_grob (Grob_info i) void Rest_collision_engraver::stop_translation_timestep () { - if (rest_collision_) - { - typeset_grob (rest_collision_); - rest_collision_ = 0; - } + rest_collision_ = 0; note_columns_.clear (); rest_count_ = 0; } diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 48621d2f61..245da72e00 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -48,16 +48,8 @@ Rest_engraver::start_translation_timestep () void Rest_engraver::stop_translation_timestep () { - if (rest_) - { - typeset_grob (rest_); - rest_ =0; - } - if (dot_) - { - typeset_grob (dot_); - dot_ =0; - } + rest_ =0; + dot_ =0; } void diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 02dd91bb7d..3c63236546 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -150,15 +150,10 @@ Rhythmic_column_engraver::acknowledge_grob (Grob_info i) void Rhythmic_column_engraver::stop_translation_timestep () { - if (note_column_) - { - typeset_grob (note_column_); note_column_ =0; - } if (spacing_) { - typeset_grob (spacing_); last_spacing_ = spacing_; spacing_ =0; } diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index b8e1e9370d..27c7d52038 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -151,15 +151,9 @@ Score_engraver::announce_grob (Grob_info info) { announce_infos_.push (info); pscore_->system_->typeset_grob (info.grob_); - elems_.push (info.grob_); + elems_.push (info.grob_); } -void -Score_engraver::typeset_grob (Grob *elem) -{ - (void) elem; - // elems_.push (elem); -} void Score_engraver::typeset_all () @@ -168,35 +162,8 @@ Score_engraver::typeset_all () { Grob * elem = elems_[i]; -#if 0 - if (Spanner *s = dynamic_cast (elem)) - { - /* - do something sensible if spanner not - spanned on 2 items. - */ - Direction d = LEFT; - do { - if (!s->get_bound (d)) - { - Grob * cc - = unsmob_grob (get_property ("currentCommandColumn")); - s->set_bound (d, cc); - /* don't warn for empty/suicided spanners, - it makes real warningsinvisible. - maybe should be junked earlier? */ - if (elem->live ()) - elem->warning (_f ("unbound spanner `%s'", s->name ().to_str0 ())); - } - } - while (flip (&d) != LEFT); - - if (dynamic_cast (s->get_parent (Y_AXIS))) - programming_error ("Spanner Y-parent is an item."); - } -#endif - if (dynamic_cast (elem)) + if (dynamic_cast (elem)) { if (!elem->get_parent (X_AXIS) && elem != command_column_ diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index e8bf2c4f60..0975c0a4dd 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -37,11 +37,7 @@ Script_column_engraver::Script_column_engraver () void Script_column_engraver::stop_translation_timestep () { - if (scol_) - { - typeset_grob (scol_); - scol_ =0; - } + scol_ =0; scripts_.clear (); } diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 4b8fa5306e..4d5a1644bb 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -221,7 +221,6 @@ Script_engraver::stop_translation_timestep () sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS); sc->set_property ("staff-padding", SCM_EOL); } - typeset_grob (sc); } scripts_.clear (); } diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index b9b3fda402..5b7054f1ee 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -91,7 +91,6 @@ Separating_line_group_engraver::finalize () Grob *column = unsmob_grob (ccol); sep_span_->set_bound (RIGHT, unsmob_grob (ccol)); - typeset_grob (sep_span_); sep_span_ =0; for (int i= 0 ; i < last_spacings_.note_spacings_.size (); i++) @@ -189,7 +188,6 @@ Separating_line_group_engraver::stop_translation_timestep () if (break_item_) { Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); - typeset_grob (break_item_); } if (Item * sp = current_spacings_.staff_spacing_) @@ -202,7 +200,6 @@ Separating_line_group_engraver::stop_translation_timestep () Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), musical_item_); - typeset_grob (sp); } @@ -216,7 +213,6 @@ Separating_line_group_engraver::stop_translation_timestep () if (musical_item_) { Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_); - typeset_grob (musical_item_); } musical_item_ =0; diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc index 8b2c2400d7..7b45796ea1 100644 --- a/lily/slash-repeat-engraver.cc +++ b/lily/slash-repeat-engraver.cc @@ -130,11 +130,7 @@ Slash_repeat_engraver::start_translation_timestep () void Slash_repeat_engraver::stop_translation_timestep () { - if (beat_slash_) - { - typeset_grob (beat_slash_); - beat_slash_ = 0; - } + beat_slash_ = 0; } diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 8d9e2b1934..7c6bc4fb6a 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -173,10 +173,6 @@ Slur_engraver::process_music () void Slur_engraver::stop_translation_timestep () { - for (int i = 0; i < end_slurs_.size (); i++) - { - typeset_grob (end_slurs_[i]); - } end_slurs_.clear (); new_slur_evs_.clear (); } diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 05803acdab..5da8f7d407 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -92,7 +92,6 @@ Spacing_engraver::finalize () Grob * p = unsmob_grob (get_property ("currentCommandColumn")); spacing_->set_bound (RIGHT, p); - typeset_grob (spacing_); spacing_ =0; } } diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index fc841e4bac..50c7be72c8 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -95,7 +95,6 @@ Span_arpeggio_engraver::stop_translation_timestep () arpeggios_[i]->set_property ("print-function", SCM_EOL); } - typeset_grob (span_arpeggio_); span_arpeggio_ = 0; } arpeggios_.clear (); diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 5842c230b0..3016528658 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -72,7 +72,7 @@ Span_bar_engraver::stop_translation_timestep () if (ly_c_equal_p (spanbar_->internal_get_property (vissym), vis)) spanbar_->internal_set_property (vissym, vis); - typeset_grob (spanbar_); + spanbar_ =0; } bars_.set_size (0); diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index e4f0574dd6..49be8930e3 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -60,7 +60,6 @@ Staff_symbol_engraver::finalize () if (span_) { span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn"))); - typeset_grob (span_); } span_ =0; } diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index 7c103de38a..8904bdd712 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -69,11 +69,7 @@ Stanza_number_engraver::acknowledge_grob (Grob_info inf) void Stanza_number_engraver::stop_translation_timestep () { - if (text_) - { - typeset_grob (text_); - text_ = 0; - } + text_ = 0; } diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index be02b75464..15bba47969 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -135,11 +135,7 @@ Stem_engraver::acknowledge_grob (Grob_info i) void Stem_engraver::stop_translation_timestep () { - if (tremolo_) - { - typeset_grob (tremolo_); - tremolo_ = 0; - } + tremolo_ = 0; if (stem_) { @@ -159,7 +155,7 @@ Stem_engraver::stop_translation_timestep () context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); } - typeset_grob (stem_); + stem_ = 0; } diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 39e21f3dc4..81dd379dae 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -85,7 +85,7 @@ System_start_delimiter_engraver::finalize () if (delim_) { delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); - typeset_grob (delim_); + } } diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 3a6285ec00..af1450d692 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -159,17 +159,7 @@ Tab_note_heads_engraver::process_music () void Tab_note_heads_engraver::stop_translation_timestep () { - for (int i=0; i < notes_.size (); i++) - { - typeset_grob (notes_[i]); - } - notes_.clear (); - for (int i=0; i < dots_.size (); i++) - { - typeset_grob (dots_[i]); - } - dots_.clear (); note_events_.clear (); tabstring_events_.clear (); diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index ca3bd57347..af6e4c5869 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -116,11 +116,6 @@ Text_engraver::process_acknowledged_grobs () void Text_engraver::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - Item *ti = texts_[i]; - typeset_grob (ti); - } texts_.clear (); evs_.clear (); } diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 6ffd0c8847..b7bd32b9e1 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -114,7 +114,6 @@ Text_spanner_engraver::typeset_all () Grob* e = unsmob_grob (get_property ("currentMusicalColumn")); finished_->set_bound (RIGHT, e); } - typeset_grob (finished_); finished_ = 0; } } diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index c1a145184c..8c41856475 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -140,11 +140,7 @@ Tie_engraver::stop_translation_timestep () ties_.clear (); last_event_ = 0; - if (tie_column_) - { - typeset_grob (tie_column_); - tie_column_ =0; - } + tie_column_ =0; } if (event_) @@ -174,7 +170,6 @@ Tie_engraver::typeset_tie (Grob *her) index_set_cell (her->get_property ("head-pair"), LEFT, new_head_drul[LEFT]->self_scm ()); index_set_cell (her->get_property ("head-pair"), RIGHT, new_head_drul[RIGHT]->self_scm ()); - typeset_grob (her); } diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 2a5a456ffc..62f0fcac7d 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -70,11 +70,7 @@ Time_signature_engraver::process_music () void Time_signature_engraver::stop_translation_timestep () { - if (time_signature_) - { - typeset_grob (time_signature_); time_signature_ =0; - } } diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 51a0fa56f8..47ce8426a5 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -118,8 +118,6 @@ Tuplet_engraver::start_translation_timestep () if (!sp->get_bound (RIGHT)) sp->set_bound (RIGHT, sp->get_bound (LEFT)); - typeset_grob (sp); - started_spanners_[i] =0; } @@ -140,11 +138,6 @@ Tuplet_engraver::start_translation_timestep () void Tuplet_engraver::finalize () { - for (int i=0; i < started_spanners_.size (); i++) - { - if (started_spanners_[i]) - typeset_grob (started_spanners_[i]); - } } diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 69fa04e42d..625b96391f 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -47,7 +47,6 @@ Vertical_align_engraver::finalize () if (valign_) { valign_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn"))); - typeset_grob (valign_); valign_ =0; } } diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 248d5740e9..6215489426 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -207,14 +207,6 @@ Volta_engraver::acknowledge_grob (Grob_info i) void Volta_engraver::finalize () { - if (volta_span_) - { - typeset_grob (volta_span_); - } - if (end_volta_span_) - { - typeset_grob (end_volta_span_); - } } @@ -235,11 +227,7 @@ Volta_engraver::stop_translation_timestep () volta_span_ = 0; } - if (end_volta_span_) - { - typeset_grob (end_volta_span_); - end_volta_span_ =0; - } + end_volta_span_ =0; } /*