From 319aba307e7c6d47a25a13a5518172d002bb472d Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:47:02 +0000 Subject: [PATCH] lilypond-1.3.33 --- flower/include/hash-table.hh | 6 +- lily/align-element.cc | 4 +- lily/auto-beam-engraver.cc | 2 +- lily/bar-engraver.cc | 8 +- lily/bar-number-engraver.cc | 2 +- lily/bar.cc | 148 +++++++++++++++- lily/beam-engraver.cc | 16 +- lily/beam.cc | 12 +- lily/break-align-item.cc | 4 +- lily/breathing-sign-engraver.cc | 2 +- lily/breathing-sign.cc | 2 +- lily/chord-name-engraver.cc | 2 +- lily/chord-tremolo-engraver.cc | 145 +++++++++++---- lily/clef-engraver.cc | 4 +- lily/clef-item.cc | 2 +- lily/collision.cc | 2 +- lily/dot-column.cc | 2 +- lily/dots.cc | 4 +- lily/dynamic-engraver.cc | 166 ++++-------------- lily/extender-engraver.cc | 6 +- lily/extender-spanner.cc | 8 +- lily/grace-align-item.cc | 4 +- lily/hara-kiri-vertical-group-spanner.cc | 2 +- lily/hyphen-engraver.cc | 6 +- lily/hyphen-spanner.cc | 8 +- lily/include/align-element.hh | 4 +- lily/include/auto-beam-engraver.hh | 2 +- lily/include/bar-engraver.hh | 2 +- lily/include/bar-number-engraver.hh | 2 +- lily/include/bar.hh | 8 +- lily/include/beam-engraver.hh | 2 +- lily/include/beam.hh | 4 +- lily/include/break-align-item.hh | 2 +- lily/include/breathing-sign-engraver.hh | 2 +- lily/include/breathing-sign.hh | 2 +- lily/include/chord-name-engraver.hh | 2 +- lily/include/clef-item.hh | 2 +- lily/include/collision.hh | 2 +- lily/include/dot-column.hh | 2 +- lily/include/dots.hh | 2 +- lily/include/extender-engraver.hh | 2 +- lily/include/extender-spanner.hh | 2 +- lily/include/font-size-engraver.hh | 2 +- lily/include/grace-align-item.hh | 2 +- .../hara-kiri-vertical-group-spanner.hh | 2 +- lily/include/hyphen-engraver.hh | 2 +- lily/include/hyphen-spanner.hh | 2 +- lily/include/key-engraver.hh | 2 +- lily/include/key-performer.hh | 2 +- lily/include/local-key-item.hh | 2 +- lily/include/lyric-engraver.hh | 2 +- lily/include/lyric-performer.hh | 2 +- lily/include/multi-measure-rest.hh | 2 +- lily/include/note-column.hh | 2 +- lily/include/note-head.hh | 2 +- lily/include/note-heads-engraver.hh | 2 +- lily/include/note-performer.hh | 2 +- lily/include/repeat-engraver.hh | 2 +- lily/include/rest-collision.hh | 2 +- lily/include/rest-engraver.hh | 2 +- lily/include/rest.hh | 2 +- lily/include/rhythmic-head.hh | 2 +- lily/include/score-element.hh | 4 +- lily/include/script-column.hh | 2 +- lily/include/script.hh | 4 +- lily/include/slur-engraver.hh | 2 +- lily/include/slur.hh | 2 +- lily/include/span-bar.hh | 6 +- lily/include/staff-performer.hh | 2 +- lily/include/stem.hh | 2 +- lily/include/tempo-performer.hh | 2 +- lily/include/tie-column.hh | 2 +- lily/include/tie-performer.hh | 2 +- lily/include/tie.hh | 2 +- lily/include/time-signature-engraver.hh | 2 +- lily/include/time-signature-performer.hh | 2 +- lily/include/timing-translator.hh | 2 +- lily/include/translator-group.hh | 2 +- lily/include/translator.hh | 2 +- lily/include/tuplet-spanner.hh | 2 +- lily/include/volta-spanner.hh | 2 +- lily/key-engraver.cc | 2 +- lily/key-performer.cc | 2 +- lily/local-key-engraver.cc | 4 +- lily/local-key-item.cc | 4 +- lily/lyric-engraver.cc | 2 +- lily/lyric-performer.cc | 2 +- lily/mark-engraver.cc | 4 +- lily/multi-measure-rest-engraver.cc | 4 +- lily/multi-measure-rest.cc | 16 +- lily/note-column.cc | 2 +- lily/note-head.cc | 2 +- lily/note-heads-engraver.cc | 2 +- lily/note-name-engraver.cc | 4 +- lily/note-performer.cc | 2 +- lily/repeat-engraver.cc | 2 +- lily/rest-collision.cc | 2 +- lily/rest-engraver.cc | 2 +- lily/rest.cc | 2 +- lily/rhythmic-head.cc | 2 +- lily/score-element.cc | 30 ++-- lily/script-column.cc | 2 +- lily/script-engraver.cc | 4 +- lily/script.cc | 4 +- lily/slur-engraver.cc | 2 +- lily/slur.cc | 64 ++----- lily/span-bar.cc | 47 +++-- lily/staff-performer.cc | 4 +- lily/stem.cc | 3 +- lily/super-element.cc | 9 +- lily/tempo-performer.cc | 2 +- lily/text-engraver.cc | 4 +- lily/tie-column.cc | 6 +- lily/tie-engraver.cc | 4 +- lily/tie-performer.cc | 2 +- lily/tie.cc | 9 +- lily/time-signature-engraver.cc | 2 +- lily/time-signature-performer.cc | 2 +- lily/timing-translator.cc | 2 +- lily/translator-group.cc | 2 +- lily/translator.cc | 4 +- lily/tuplet-engraver.cc | 4 +- lily/tuplet-spanner.cc | 10 +- lily/volta-spanner.cc | 6 +- 124 files changed, 542 insertions(+), 445 deletions(-) diff --git a/flower/include/hash-table.hh b/flower/include/hash-table.hh index aec7ae31af..bd437e6e97 100644 --- a/flower/include/hash-table.hh +++ b/flower/include/hash-table.hh @@ -61,9 +61,12 @@ public: int lookup (K s, unsigned int initial_hash) { int sz =dict_arr_.size (); - int i = initial_hash % sz; + initial_hash = initial_hash % sz; + int i; int j = 0; while (j <= sz/2) { + i = (initial_hash + j*j) % sz; + if (dict_arr_[i].free_b_) return i; @@ -71,7 +74,6 @@ public: return i; j++; - i = (i + j*j) % sz; } diff --git a/lily/align-element.cc b/lily/align-element.cc index 2f5c617ac6..c75902783b 100644 --- a/lily/align-element.cc +++ b/lily/align-element.cc @@ -14,14 +14,14 @@ #include "dimension-cache.hh" void -Align_element::do_post_processing() +Align_element::after_line_breaking() { if (axis () == Y_AXIS) do_side_processing (); } void -Align_element::do_pre_processing () +Align_element::before_line_breaking () { if (axis () == X_AXIS) do_side_processing (); diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 95052f5e1d..779d0781b0 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -43,7 +43,7 @@ Auto_beam_engraver::do_try_music (Music*) } void -Auto_beam_engraver::do_process_requests () +Auto_beam_engraver::do_process_music () { consider_end_and_begin (shortest_mom_); } diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index a9e1da7957..68c8760492 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -44,7 +44,11 @@ Bar_engraver::create_bar () #if 0 /* urg. Why did I implement this? And did I implement this so - clumsily? */ + clumsily? + + input/test/just-friends.ly + Maybe a staffgroup of just one staff would be a better solution. + */ SCM prop = get_property ("barAtLineStart"); if (to_boolean (prop)) { @@ -103,7 +107,7 @@ Bar_engraver::do_removal_processing () } void -Bar_engraver::do_process_requests() +Bar_engraver::do_process_music() { Translator * t = daddy_grav_l ()->get_simple_translator ("Timing_engraver"); diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 1715fde5de..c334d087ee 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -22,7 +22,7 @@ Bar_number_engraver::Bar_number_engraver() void -Bar_number_engraver::do_process_requests () +Bar_number_engraver::do_process_music () { Translator *tr = daddy_grav_l ()->get_simple_translator ("Timing_engraver"); Timing_translator *time = dynamic_cast(tr); diff --git a/lily/bar.cc b/lily/bar.cc index e4f66f1d35..7bcccfed32 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -5,7 +5,10 @@ (c) 1997--2000 Han-Wen Nienhuys */ +#include +#include "main.hh" +#include "dimensions.hh" #include "dimension-cache.hh" #include "bar.hh" #include "string.hh" @@ -13,7 +16,7 @@ #include "paper-def.hh" #include "lookup.hh" #include "debug.hh" - +#include "all-font-metrics.hh" Bar::Bar () { @@ -32,14 +35,151 @@ Bar::get_bar_size () const Molecule Bar::do_brew_molecule () const { - String s = ly_scm2string (get_elt_property ("glyph")); - return lookup_l ()->bar (s, get_bar_size (), paper_l ()); + SCM s = get_elt_property ("glyph"); + if (gh_string_p (s)) + { + String str =ly_scm2string (s); + if (str == "bracket") + return staff_bracket (get_bar_size ()); + else if (str == "brace") + return staff_brace (get_bar_size ()); + else + return compound_barline (str, get_bar_size ()); + } + return Molecule (); +} + + +Molecule +Bar::staff_bracket (Real height) const +{ + Paper_def* p= paper_l (); + SCM at = gh_list (ly_symbol2scm ("bracket"), + gh_double2scm (p->get_var("bracket_arch_angle")), + gh_double2scm (p->get_var("bracket_arch_width")), + gh_double2scm (p->get_var("bracket_arch_height")), + gh_double2scm (p->get_var("bracket_width")), + gh_double2scm (height), + gh_double2scm (p->get_var("bracket_arch_thick")), + gh_double2scm (p->get_var("bracket_thick")), + SCM_UNDEFINED); + + Real staff_space = p->get_var ("interline"); + Box b (Interval (0, 1.5 * staff_space), Interval (-height/2,height/2)); + Molecule mol (b, at); + + mol.translate_axis (- mol.dim_[X_AXIS].length () / 2, X_AXIS); + return mol; } +Molecule +Bar::compound_barline (String str, Real h) const +{ + Real kern = paper_l()->get_var ("bar_kern"); + Real thinkern = paper_l()->get_var ("bar_thinkern"); + + Molecule thin = simple_barline (paper_l()->get_var ("barthick_thin"), h); + Molecule thick = simple_barline (paper_l()->get_var ("barthick_thick"), h); + Molecule colon = lookup_l ()->afm_find ("dots-repeatcolon"); + + Molecule m; + + if (str == "") + { + return lookup_l ()->blank (Box (Interval(0, 0), Interval (-h/2, h/2))); + } + if (str == "scorepostbreak") + { + return simple_barline (paper_l ()->get_var ("barthick_score"), h); + } + else if (str == "|") + { + return thin; + } + else if (str == "|.") + { + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + } + else if (str == ".|") + { + m.add_at_edge (X_AXIS, RIGHT, thick, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); + } + else if (str == ":|") + { + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); + } + else if (str == "|:") + { + m.add_at_edge (X_AXIS, RIGHT, thick, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); + m.add_at_edge (X_AXIS, RIGHT, colon, kern); + } + else if (str == ":|:") + { + m.add_at_edge (X_AXIS, LEFT, thick, thinkern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); + m.add_at_edge (X_AXIS, RIGHT, thick, kern); + m.add_at_edge (X_AXIS, RIGHT, colon, kern); + } + else if (str == ".|.") + { + m.add_at_edge (X_AXIS, LEFT, thick, thinkern); + m.add_at_edge (X_AXIS, RIGHT, thick, kern); + } + else if (str == "||") + { + m.add_at_edge (X_AXIS, RIGHT, thin, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, thinkern); + } + + return m; +} + +/* + ugh. Suck me plenty. + */ +Molecule +Bar::staff_brace (Real y) const +{ + Real staffht = paper_l ()->get_var ("staffheight"); + int staff_size = int (rint (staffht )); + + // URG + Real step = 1.0; + int minht = 2 * staff_size; + int maxht = 7 * minht; + int idx = int (((maxht - step) ? 0; + + SCM l = ly_eval_str ("(style-to-cmr \"brace\")"); + String nm = "feta-braces"; + if (l != SCM_BOOL_F) + nm = ly_scm2string (gh_cdr (l)); + nm += to_str (staff_size); + SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED); + SCM at = (e); + + at = fontify_atom (all_fonts_global_p->find_font (nm), at); + + Box b ( Interval (-y/2,y/2), + Interval (0,0)); + return Molecule(b, at); +} + + +Molecule +Bar::simple_barline (Real w, Real h) const +{ + return lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); +} void -Bar::do_pre_processing () +Bar::before_line_breaking () { SCM g = get_elt_property ("glyph"); Direction bsd = break_status_dir (); diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 15606f34b8..cb65aa5863 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -39,7 +39,7 @@ Beam_engraver::do_try_music (Music *m) if (d == STOP && !beam_p_) { - m->warning (_ ("no beam to end")); + m->warning (_ ("can't find start of beam")); return false; } reqs_drul_[d ] = c; @@ -50,12 +50,12 @@ Beam_engraver::do_try_music (Music *m) void -Beam_engraver::do_process_requests () +Beam_engraver::do_process_music () { if (reqs_drul_[STOP]) { if (!beam_p_) - reqs_drul_[STOP]->warning (_("no beam to end")); + reqs_drul_[STOP]->warning (_("can't find start of beam")); prev_start_req_ =0; finished_beam_p_ = beam_p_; finished_beam_info_p_ = beam_info_p_; @@ -84,7 +84,7 @@ Beam_engraver::do_process_requests () { if (beam_p_) { - reqs_drul_[START]->warning (_ ("Already have a beam")); + reqs_drul_[START]->warning (_ ("already have a beam")); return; } @@ -139,7 +139,7 @@ Beam_engraver::do_removal_processing () typeset_beam (); if (beam_p_) { - prev_start_req_->warning (_ ("unfinished beam")); + prev_start_req_->warning (_ ("unterminated beam")); finished_beam_p_ = beam_p_; finished_beam_info_p_ = beam_info_p_; typeset_beam (); @@ -167,7 +167,7 @@ Beam_engraver::acknowledge_element (Score_element_info info) Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); if (!rhythmic_req) { - String s = _ ("Stem must have Rhythmic structure"); + String s = _ ("stem must have Rhythmic structure"); if (info.req_l_) info.req_l_->warning (s); else @@ -178,8 +178,8 @@ Beam_engraver::acknowledge_element (Score_element_info info) if (rhythmic_req->duration_.durlog_i_<= 2) { - rhythmic_req->warning (_ ("Stem doesn't fit in beam")); - prev_start_req_->warning (_ ("Beam was started here")); + rhythmic_req->warning (_ ("stem doesn't fit in beam")); + prev_start_req_->warning (_ ("beam was started here")); /* don't return, since diff --git a/lily/beam.cc b/lily/beam.cc index e104c10ec8..d641c8912c 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -50,10 +50,10 @@ Beam::add_stem (Stem*s) assert (!s->beam_l ()); s->set_elt_property ("beam", self_scm_); - if (!spanned_drul_[LEFT]) - set_bounds (LEFT,s); + if (!get_bound (LEFT)) + set_bound (LEFT,s); else - set_bounds (RIGHT,s); + set_bound (RIGHT,s); } int @@ -79,7 +79,7 @@ Beam::get_multiplicity () const their beam, during 'final-pre-processing'.] */ void -Beam::do_pre_processing () +Beam::before_line_breaking () { // Why? if (visible_stem_count () < 2) @@ -263,7 +263,7 @@ Beam::set_stem_shorten () Adjust stem lengths to reach beam. */ void -Beam::do_post_processing () +Beam::after_line_breaking () { /* first, calculate y, dy */ Real y, dy; @@ -742,7 +742,7 @@ Beam::do_brew_molecule () const mol.add_molecule (sb); } mol.translate_axis (x0 - - spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS), X_AXIS); + - get_bound (LEFT)->relative_coordinate (0, X_AXIS), X_AXIS); return mol; } diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 84fa63071d..dfb91c3845 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -24,7 +24,7 @@ */ void -Break_align_item::do_pre_processing() +Break_align_item::before_line_breaking () { Direction ad = (break_status_dir() == LEFT) ? RIGHT : LEFT; Real interline= paper_l ()->get_var ("interline"); @@ -103,7 +103,7 @@ Break_align_item::do_pre_processing() scm_set_car_x (first_pair, gh_double2scm (-dists[0])); elems[0]->set_elt_property ("minimum-space", first_pair); - Axis_align_item::do_pre_processing(); + Axis_align_item::before_line_breaking (); Real pre_space = elems[0]->relative_coordinate (column_l (), X_AXIS); diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 46761a934f..afa950d618 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -42,7 +42,7 @@ Breathing_sign_engraver::do_try_music (Music*r_l) } void -Breathing_sign_engraver::do_process_requests() +Breathing_sign_engraver::do_process_music() { if(breathing_sign_req_l_) { diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 54120930f3..0b9758edc3 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -39,7 +39,7 @@ Breathing_sign::do_brew_molecule () const } void -Breathing_sign::do_post_processing() +Breathing_sign::after_line_breaking () { Real space = staff_symbol_referencer (this).staff_space(); Direction d = directional_element (this). get (); diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index cf2891b02c..eb28971785 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -61,7 +61,7 @@ Chord_name_engraver::do_try_music (Music* m) } void -Chord_name_engraver::do_process_requests () +Chord_name_engraver::do_process_music () { if (chord_name_p_) return; diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 4b6ab0e69b..769ec5a3fc 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -8,22 +8,65 @@ */ #include "timing-translator.hh" -#include "chord-tremolo-engraver.hh" #include "stem.hh" #include "beam.hh" #include "musical-request.hh" #include "misc.hh" #include "warn.hh" #include "score-engraver.hh" +#include "engraver.hh" +#include "drul-array.hh" +#include "timing-engraver.hh" +#include "beaming.hh" + +/** + Generate a beam tremolo. Eat stems. + + UGH. Derive me from Beam_engraver. + + */ +class Chord_tremolo_engraver : public Engraver +{ +public: + VIRTUAL_COPY_CONS(Translator); + + + Chord_tremolo_engraver(); + +protected: + virtual void do_removal_processing(); + virtual void do_process_music(); + virtual bool do_try_music (Music*); + virtual void acknowledge_element (Score_element_info); + virtual void do_pre_move_processing(); + virtual void do_post_move_processing(); + +private: + void typeset_beam (); + Drul_array reqs_drul_; + Chord_tremolo_req* prev_start_req_; + Beam* beam_p_; + Beam* finished_beam_p_; + + /// location within measure where beam started. + Moment beam_start_location_; + + /// moment (global time) where beam started. + Moment beam_start_mom_; + Beaming_info_list * beam_info_p_; + Beaming_info_list * finished_beam_info_p_; +}; ADD_THIS_TRANSLATOR (Chord_tremolo_engraver); Chord_tremolo_engraver::Chord_tremolo_engraver () { reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0; - abeam_p_ = 0; - finished_abeam_p_ = 0; + beam_p_ = 0; + finished_beam_p_ = 0; prev_start_req_ = 0; + finished_beam_info_p_=0; + beam_info_p_ =0; } bool @@ -35,9 +78,9 @@ Chord_tremolo_engraver::do_try_music (Music* m) if (reqs_drul_[d] && !reqs_drul_[d]->equal_b (b)) return false; - if ((d == STOP) && !abeam_p_) + if ((d == STOP) && !beam_p_) { - m->warning (_ ("no tremolo beam to end")); + m->warning (_ ("can't find start of chord tremolo")); return false; } @@ -49,18 +92,23 @@ Chord_tremolo_engraver::do_try_music (Music* m) } void -Chord_tremolo_engraver::do_process_requests () +Chord_tremolo_engraver::do_process_music () { if (reqs_drul_[STOP]) { - if (!abeam_p_) - reqs_drul_[STOP]->warning (_ ("no tremolo beam to end")); + if (!beam_p_) + reqs_drul_[STOP]->warning (_ ("can't find start of chord tremolo")); + prev_start_req_ = 0; - finished_abeam_p_ = abeam_p_; - abeam_p_ = 0; + + finished_beam_p_ = beam_p_; + beam_p_ = 0; + + finished_beam_info_p_ = beam_info_p_; + beam_info_p_ = 0; } - if (abeam_p_) + if (beam_p_) { Score_engraver * e = 0; Translator * t = daddy_grav_l (); @@ -77,18 +125,23 @@ Chord_tremolo_engraver::do_process_requests () if (reqs_drul_[START]) { - if (abeam_p_) + if (beam_p_) { - reqs_drul_[START]->warning (_ ("Already have a tremolo beam")); + reqs_drul_[START]->warning (_ ("already have a chord tremolo")); return; } prev_start_req_ = reqs_drul_[START]; - abeam_p_ = new Beam; - abeam_p_->set_elt_property ("chord-tremolo", SCM_BOOL_T); + beam_p_ = new Beam; + beam_p_->set_elt_property ("chord-tremolo", SCM_BOOL_T); + Translator * t = daddy_grav_l ()->get_simple_translator ("Timing_engraver"); + Timing_engraver *timer = dynamic_cast (t); + beam_start_location_ = (t) ? timer->measure_position () : Moment (0); + beam_start_mom_ = now_mom(); + beam_info_p_ = new Beaming_info_list; - announce_element (Score_element_info (abeam_p_, reqs_drul_[LEFT])); + announce_element (Score_element_info (beam_p_, reqs_drul_[LEFT])); } } @@ -98,6 +151,7 @@ Chord_tremolo_engraver::do_post_move_processing () reqs_drul_ [START] = 0; } + void Chord_tremolo_engraver::do_pre_move_processing () { @@ -107,10 +161,14 @@ Chord_tremolo_engraver::do_pre_move_processing () void Chord_tremolo_engraver::typeset_beam () { - if (finished_abeam_p_) + if (finished_beam_p_) { - typeset_element (finished_abeam_p_); - finished_abeam_p_ = 0; + finished_beam_info_p_->beamify (); + finished_beam_p_->set_beaming (finished_beam_info_p_); + typeset_element (finished_beam_p_); + finished_beam_p_ = 0; + delete finished_beam_info_p_; + finished_beam_info_p_ =0; reqs_drul_[STOP] = 0; } @@ -120,20 +178,21 @@ void Chord_tremolo_engraver::do_removal_processing () { typeset_beam (); - if (abeam_p_) + if (beam_p_) { - prev_start_req_->warning (_ ("unfinished tremolo beam")); - finished_abeam_p_ = abeam_p_; + prev_start_req_->warning (_ ("unterminated chord tremolo")); + finished_beam_p_ = beam_p_; + finished_beam_info_p_ = beam_info_p_; typeset_beam (); } } void -Chord_tremolo_engraver::acknowledge_element (Score_element_info i) +Chord_tremolo_engraver::acknowledge_element (Score_element_info info) { - if (abeam_p_) + if (beam_p_) { - if (Stem* s = dynamic_cast (i.elem_l_)) + if (Stem* s = dynamic_cast (info.elem_l_)) { int type_i = prev_start_req_->type_i_; s->set_elt_property ("duration-log", gh_int2scm (intlog2 (type_i) - 2)); @@ -141,22 +200,38 @@ Chord_tremolo_engraver::acknowledge_element (Score_element_info i) s->set_beaming (s->flag_i (), LEFT); s->set_beaming ( s->flag_i (), RIGHT); - -#if 0 + /* + URG: this sets the direction of the Stem s. + It's amazing Mike: + + Stem:: type_i () ->first_head ()->get_direction () -> + directional_element (me).set (d); + + */ + SCM d = s->get_elt_property ("direction"); if (s->type_i () != 1) { int gap_i =s->flag_i () - ((s->type_i () >? 2) - 2); - s->set_elt_property ("beam-gap", gh_int2scm(gap_i)); + beam_p_->set_elt_property ("beam-gap", gh_int2scm(gap_i)); } -#else - if (s->type_i () != 1) + s->set_elt_property ("direction", d); + + if (Rhythmic_req* r = dynamic_cast (info.req_l_)) { - int gap_i =s->flag_i () - ((s->type_i () >? 2) - 2); - abeam_p_->set_elt_property ("beam-gap", gh_int2scm(gap_i)); + beam_p_->add_stem (s); + Moment stem_location = now_mom () - + beam_start_mom_ + beam_start_location_; + beam_info_p_->add_stem (stem_location, + (r->duration_.durlog_i_ - 2) >? 1); + } + else + { + String s = _ ("stem must have Rhythmic structure"); + if (info.req_l_) + info.req_l_->warning (s); + else + ::warning (s); } -#endif - - abeam_p_->add_stem (s); } } } diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 162cc06978..835b2c5760 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -29,7 +29,7 @@ class Clef_engraver : public Engraver { void create_clef(); bool set_type (String); protected: - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); virtual void do_creation_processing(); virtual void do_post_move_processing(); @@ -183,7 +183,7 @@ Clef_engraver::create_clef() void -Clef_engraver::do_process_requests() +Clef_engraver::do_process_music() { if (clef_req_l_) { diff --git a/lily/clef-item.cc b/lily/clef-item.cc index 35f4d46bf3..d49534d727 100644 --- a/lily/clef-item.cc +++ b/lily/clef-item.cc @@ -19,7 +19,7 @@ #include "warn.hh" void -Clef_item::do_pre_processing() +Clef_item::before_line_breaking () { SCM style_sym =get_elt_property ("style"); String style; diff --git a/lily/collision.cc b/lily/collision.cc index 0de6a942f8..161016104c 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -28,7 +28,7 @@ Collision::add_column (Note_column* ncol_l) */ void -Collision::do_pre_processing() +Collision::before_line_breaking () { Array autos (automatic_shift ()); Array hand (forced_shift ()); diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 2e80a913bc..d9331f8907 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -70,7 +70,7 @@ Dot_column::Dot_column () Should be smarter. */ void -Dot_column::do_post_processing () +Dot_column::after_line_breaking () { Link_array dots = Group_interface__extract_elements (this, (Dots*)0 , "dots"); dots.sort (Dot_column::compare); diff --git a/lily/dots.cc b/lily/dots.cc index f63f77ddae..7846e2d367 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -19,7 +19,7 @@ Dots::Dots () } void -Dots::do_post_processing () +Dots::after_line_breaking () { SCM d= get_elt_property ("dot-count"); if (!gh_number_p (d) || !gh_scm2int (d)) @@ -42,7 +42,7 @@ Dots::do_post_processing () Molecule Dots::do_brew_molecule () const { - Molecule mol (lookup_l ()->fill (Box (Interval (0,0), + Molecule mol (lookup_l ()->blank (Box (Interval (0,0), Interval (0,0)))); Molecule d = lookup_l ()->afm_find (String ("dots-dot")); diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index d36142c8e2..87ab488ac6 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -24,22 +24,13 @@ #include "staff-symbol-referencer.hh" #include "translator-group.hh" -/* - Wat mij betreft wel DYN_LINE - */ -#define DYN_LINE - - -#ifdef DYN_LINE class Dynamic_line_spanner : public Spanner { public: Dynamic_line_spanner (); - - void add_column (Note_column*); + VIRTUAL_COPY_CONS(Score_element); + void add_column (Item*); Direction get_default_dir () const; -protected: - virtual void do_post_processing (); }; Dynamic_line_spanner::Dynamic_line_spanner () @@ -49,11 +40,12 @@ Dynamic_line_spanner::Dynamic_line_spanner () } void -Dynamic_line_spanner::add_column (Note_column* n) +Dynamic_line_spanner::add_column (Item* n) { - if (!spanned_drul_[LEFT]) - set_bounds (LEFT, n); - set_bounds (RIGHT, n); + if (!get_bound (LEFT)) + set_bound (LEFT, n); + else + set_bound (RIGHT, n); add_dependency (n); } @@ -64,54 +56,6 @@ Dynamic_line_spanner::get_default_dir () const return DOWN; } -void -Dynamic_line_spanner::do_post_processing () -{ - Spanner::do_post_processing (); - Direction dir = directional_element (this).get (); - if (!dir) - dir = get_default_dir (); - - /* - Hier is ook vast iets voor? - */ - Staff_symbol_referencer_interface si (this); - Real above_staff = si.line_count () + 2; - -#if 0 - // Aargh, nu snap ik waarom ik het niet snap - // zie Staff_symbol_referencer_interface::set_position - - if (si.position_f () * dir < above_staff) - si.set_position (above_staff * (int)dir); - - SCM s = get_elt_property ("padding"); - if (gh_number_p (s)) - { - si.set_position (si.position_f () + gh_scm2double (s) * (int) dir); - } -#else - Real dy = 0; - Real pos = si.position_f () * dir; - if (pos * dir < above_staff) - dy = above_staff; - - SCM s = get_elt_property ("padding"); - if (gh_number_p (s)) - dy += gh_scm2double (s); - - Real half_space = si.staff_space () / 2; - translate_axis (dy*half_space*dir, Y_AXIS); -#endif - -} - -#endif -/* - TODO: - Baseline alignment / character metrics of dynamic symbols. - */ - /** print text & hairpin dynamics. */ @@ -125,11 +69,7 @@ class Dynamic_engraver : public Engraver Span_req * span_start_req_l_; Drul_array span_req_l_drul_; -#ifdef DYN_LINE Dynamic_line_spanner* line_spanner_; -#else - Spanner* line_spanner_; -#endif Moment last_request_mom_; void typeset_all (); @@ -144,7 +84,7 @@ protected: virtual void do_removal_processing (); virtual void acknowledge_element (Score_element_info); virtual bool do_try_music (Music *req_l); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); }; @@ -179,6 +119,12 @@ Dynamic_engraver::do_post_move_processing () text_req_l_ = 0; span_req_l_drul_[START] = 0; span_req_l_drul_[STOP] = 0; + + /* ugr; we must attach the Dynamic_line_spanner to something + to be sure that the linebreaker will not be confused + */ + // if (line_spanner_) + // line_spanner_->add_column (LEFT, get_staff_info ().command_pcol_l ()); } bool @@ -205,17 +151,12 @@ Dynamic_engraver::do_try_music (Music * m) } void -Dynamic_engraver::do_process_requests () +Dynamic_engraver::do_process_music () { if ((span_req_l_drul_[START] || text_req_l_) && !line_spanner_) { -#ifdef DYN_LINE line_spanner_ = new Dynamic_line_spanner; -#else - line_spanner_ = new Spanner; - line_spanner_->set_elt_property ("transparent", SCM_BOOL_T); side_position (line_spanner_).set_axis (Y_AXIS); -#endif announce_element (Score_element_info (line_spanner_, text_req_l_ ? text_req_l_ : span_req_l_drul_[START])); @@ -225,34 +166,6 @@ Dynamic_engraver::do_process_requests () if (span_req_l_drul_[START] || text_req_l_) last_request_mom_ = now_mom (); -#ifndef DYN_LINE - if (line_spanner_) - { - /* - Generic property will handle this for a Dynamic_line_spanner - */ - Direction dir = DOWN; - SCM s = get_property ("dynamicDirection"); - if (!isdir_b (s)) - { - s = get_property ("verticalDirection"); - } - - if (isdir_b (s) && to_dir (s)) - dir = to_dir (s); - - line_spanner_->set_elt_property ("direction", gh_int2scm ((int)dir)); - - s = get_property ("dynamicPadding"); - Real padding; - if (gh_number_p (s)) - padding = gh_scm2double (s); - else - padding = 2; - line_spanner_->set_elt_property ("padding", gh_double2scm (padding)); - } -#endif - if (text_req_l_) { String loud = text_req_l_->text_str_; @@ -279,7 +192,8 @@ Dynamic_engraver::do_process_requests () else { assert (!finished_cresc_p_); - cresc_p_->set_bounds(RIGHT, get_staff_info ().musical_pcol_l ()); + cresc_p_->set_bound(RIGHT, get_staff_info ().musical_pcol_l ()); + // cresc_p_->add_dependency (get_staff_info ().musical_pcol_l ()); finished_cresc_p_ = cresc_p_; cresc_p_ = 0; span_start_req_l_ = 0; @@ -321,10 +235,21 @@ Dynamic_engraver::do_process_requests () + "Spanner", SCM_UNDEFINED); } - cresc_p_->set_bounds(LEFT, get_staff_info ().musical_pcol_l ()); - cresc_p_->set_bounds(RIGHT, get_staff_info ().musical_pcol_l ()); + cresc_p_->set_bound(LEFT, get_staff_info ().musical_pcol_l ()); + + + // cresc_p_->add_dependency (get_staff_info ().musical_pcol_l ()); + + /* + We know how wide the text is, if we can be sure that the + text already has relevant pointers into the paperdef, + and it has its font-size property set. - // arrragh, brr, urg: we know how wide text is, no? + Since font-size may be set by a context higher up, we + can not be sure of the size. + */ + + if (text_p_) { index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"), @@ -336,6 +261,7 @@ Dynamic_engraver::do_process_requests () assert (line_spanner_); cresc_p_->set_parent (line_spanner_, Y_AXIS); + // cresc_p_->add_dependency (line_spanner_); announce_element (Score_element_info (cresc_p_, span_req_l_drul_[START])); } } @@ -347,6 +273,7 @@ Dynamic_engraver::do_pre_move_processing () typeset_all (); } + void Dynamic_engraver::do_removal_processing () { @@ -359,12 +286,6 @@ Dynamic_engraver::do_removal_processing () typeset_all (); if (line_spanner_) { -#ifndef DYN_LINE - Direction dir = directional_element (line_spanner_).get (); - Real staff_space = Staff_symbol_referencer_interface (line_spanner_).staff_space (); - SCM s = line_spanner_->get_elt_property ("padding"); - line_spanner_->translate_axis (gh_scm2double (s) * staff_space * (int)dir, Y_AXIS); -#endif typeset_element (line_spanner_); line_spanner_ = 0; } @@ -376,7 +297,6 @@ Dynamic_engraver::typeset_all () { if (finished_cresc_p_) { - finished_cresc_p_->set_bounds (RIGHT, get_staff_info ().musical_pcol_l ()); typeset_element (finished_cresc_p_); finished_cresc_p_ =0; } @@ -391,16 +311,12 @@ Dynamic_engraver::typeset_all () TODO: This should be optionised: * break when group of dynamic requests ends * break now - * continue through piece - */ + * continue through piece */ if (line_spanner_ && last_request_mom_ < now_mom ()) { -#ifndef DYN_LINE - Direction dir = directional_element (line_spanner_).get (); - Real staff_space = Staff_symbol_referencer_interface (line_spanner_).staff_space (); - SCM s = line_spanner_->get_elt_property ("padding"); - line_spanner_->translate_axis (gh_scm2double (s) * staff_space * (int)dir, Y_AXIS); -#endif + + side_position (line_spanner_).add_staff_support (); + typeset_element (line_spanner_); line_spanner_ = 0; } @@ -414,15 +330,7 @@ Dynamic_engraver::acknowledge_element (Score_element_info i) if (Note_column* n = dynamic_cast (i.elem_l_)) { side_position (line_spanner_).add_support (n); -#ifdef DYN_LINE line_spanner_->add_column (n); -#else - if (!line_spanner_->spanned_drul_[LEFT]) - line_spanner_->set_bounds (LEFT, n); - line_spanner_->set_bounds (RIGHT, n); - - line_spanner_->add_dependency (n); -#endif } } } diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 32e6f01f38..aba5025d69 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -31,7 +31,7 @@ Extender_engraver::acknowledge_element (Score_element_info i) { current_lyric_l_ = t; if (extender_spanner_p_ - && !extender_spanner_p_->spanned_drul_[RIGHT] + && !extender_spanner_p_->get_bound (RIGHT) ) { extender_spanner_p_->set_textitem (RIGHT, t); @@ -60,12 +60,12 @@ Extender_engraver::do_removal_processing () if (extender_spanner_p_) { req_l_->warning (_ ("unterminated extender")); - extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ()); + extender_spanner_p_->set_bound(RIGHT, get_staff_info ().command_pcol_l ()); } } void -Extender_engraver::do_process_requests () +Extender_engraver::do_process_music () { if (req_l_) { diff --git a/lily/extender-spanner.cc b/lily/extender-spanner.cc index ff02c16d92..0f5cbfb5d9 100644 --- a/lily/extender-spanner.cc +++ b/lily/extender-spanner.cc @@ -50,7 +50,7 @@ Extender_spanner::do_brew_molecule () const void -Extender_spanner::do_post_processing () +Extender_spanner::after_line_breaking () { // UGH Real gap = paper_l ()->get_var ("interline"); @@ -58,8 +58,8 @@ Extender_spanner::do_post_processing () Direction d = LEFT; do { - Item* t = spanned_drul_[d] - ? spanned_drul_[d] : spanned_drul_[(Direction)-d]; + Item* t = get_bound (d) + ? get_bound (d) : get_bound ((Direction)-d); if (d == LEFT) dx_f_drul_[d] += t->extent (X_AXIS).length (); else @@ -72,7 +72,7 @@ Extender_spanner::do_post_processing () void Extender_spanner::set_textitem (Direction d, Item* textitem_l) { - set_bounds (d, textitem_l); + set_bound (d, textitem_l); add_dependency (textitem_l); } diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc index 3d3df3ca0f..2ae9d267e9 100644 --- a/lily/grace-align-item.cc +++ b/lily/grace-align-item.cc @@ -19,7 +19,7 @@ Grace_align_item::Grace_align_item () } void -Grace_align_item::do_pre_processing () +Grace_align_item::before_line_breaking () { Real nhw = // lookup_l ()->notehead (2, "").dim_[X_AXIS].length(); paper_l ()->get_var ("quartwidth"); @@ -28,7 +28,7 @@ Grace_align_item::do_pre_processing () column_l ()->set_elt_property ("contains-grace", SCM_BOOL_T); - Axis_align_item::do_pre_processing (); + Axis_align_item::before_line_breaking (); // translate_axis (-0.5* nhw, X_AXIS); // ugh. } diff --git a/lily/hara-kiri-vertical-group-spanner.cc b/lily/hara-kiri-vertical-group-spanner.cc index f5b1e47294..3abb6296f2 100644 --- a/lily/hara-kiri-vertical-group-spanner.cc +++ b/lily/hara-kiri-vertical-group-spanner.cc @@ -28,7 +28,7 @@ Hara_kiri_group_spanner::add_interesting_item (Item* n) } void -Hara_kiri_group_spanner::do_post_processing () +Hara_kiri_group_spanner::after_line_breaking () { SCM worth = get_elt_property ("items-worth-living"); if (gh_pair_p (worth)) diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index 1b73e01499..72eb2268fe 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -29,7 +29,7 @@ Hyphen_engraver::acknowledge_element (Score_element_info i) { current_lyric_l_ = t; if (hyphen_spanner_p_ - && !hyphen_spanner_p_->spanned_drul_[RIGHT] + && !hyphen_spanner_p_->get_bound (RIGHT) ) { hyphen_spanner_p_->set_textitem (RIGHT, t); @@ -58,12 +58,12 @@ Hyphen_engraver::do_removal_processing () if (hyphen_spanner_p_) { req_l_->warning (_ ("unterminated hyphen")); - hyphen_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ()); + hyphen_spanner_p_->set_bound(RIGHT, get_staff_info ().command_pcol_l ()); } } void -Hyphen_engraver::do_process_requests () +Hyphen_engraver::do_process_music () { if (req_l_) { diff --git a/lily/hyphen-spanner.cc b/lily/hyphen-spanner.cc index 65470ea81c..5f41e23d53 100644 --- a/lily/hyphen-spanner.cc +++ b/lily/hyphen-spanner.cc @@ -57,7 +57,7 @@ Hyphen_spanner::do_brew_molecule () const void -Hyphen_spanner::do_post_processing () +Hyphen_spanner::after_line_breaking () { // UGH Real gap = paper_l ()->get_var ("interline"); @@ -65,8 +65,8 @@ Hyphen_spanner::do_post_processing () Direction d = LEFT; do { - Item* t = spanned_drul_[d] - ? spanned_drul_[d] : spanned_drul_[(Direction)-d]; + Item* t = get_bound (d) + ? get_bound (d) : get_bound ((Direction)-d); if (d == LEFT) dx_f_drul_[d] += t->extent (X_AXIS).length (); else @@ -79,7 +79,7 @@ Hyphen_spanner::do_post_processing () void Hyphen_spanner::set_textitem (Direction d, Item* textitem_l) { - set_bounds (d, textitem_l); + set_bound (d, textitem_l); add_dependency (textitem_l); } diff --git a/lily/include/align-element.hh b/lily/include/align-element.hh index c6e230df5d..49d4e4bab1 100644 --- a/lily/include/align-element.hh +++ b/lily/include/align-element.hh @@ -50,8 +50,8 @@ public: void set_axis (Axis); int get_count (Score_element*)const; protected: - virtual void do_post_processing() ; - virtual void do_pre_processing (); + virtual void after_line_breaking () ; + virtual void before_line_breaking (); virtual void do_side_processing (); }; #endif // VERTICAL_ALIGN_ITEM_HH diff --git a/lily/include/auto-beam-engraver.hh b/lily/include/auto-beam-engraver.hh index 6621ecce1a..2c7575fde4 100644 --- a/lily/include/auto-beam-engraver.hh +++ b/lily/include/auto-beam-engraver.hh @@ -24,7 +24,7 @@ protected: virtual void do_post_move_processing (); virtual void do_removal_processing (); virtual void acknowledge_element (Score_element_info); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void process_acknowledged (); virtual void do_creation_processing (); private: diff --git a/lily/include/bar-engraver.hh b/lily/include/bar-engraver.hh index 388cc17149..7f446bcd13 100644 --- a/lily/include/bar-engraver.hh +++ b/lily/include/bar-engraver.hh @@ -26,7 +26,7 @@ public: protected: virtual void do_creation_processing (); virtual void do_removal_processing (); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); diff --git a/lily/include/bar-number-engraver.hh b/lily/include/bar-number-engraver.hh index eb1c7de7fa..22c6c3ef22 100644 --- a/lily/include/bar-number-engraver.hh +++ b/lily/include/bar-number-engraver.hh @@ -14,7 +14,7 @@ class Bar_number_engraver : public Bar_script_engraver { protected: - void do_process_requests (); + void do_process_music (); public: VIRTUAL_COPY_CONS(Translator); Bar_number_engraver(); diff --git a/lily/include/bar.hh b/lily/include/bar.hh index 1e4f8c539a..994f04b500 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -15,8 +15,14 @@ class Bar:public Item { public: VIRTUAL_COPY_CONS(Score_element); Bar(); + + Molecule staff_bracket (Real height) const; + Molecule staff_brace (Real height) const; + Molecule compound_barline (String, Real height) const; + Molecule simple_barline (Real wid, Real height) const; + protected: - virtual void do_pre_processing (); + virtual void before_line_breaking (); virtual Molecule do_brew_molecule () const; virtual Real get_bar_size () const; }; diff --git a/lily/include/beam-engraver.hh b/lily/include/beam-engraver.hh index 044cfaddb7..9393529a11 100644 --- a/lily/include/beam-engraver.hh +++ b/lily/include/beam-engraver.hh @@ -36,7 +36,7 @@ protected: virtual void do_removal_processing (); virtual void acknowledge_element (Score_element_info); virtual bool do_try_music (Music*); - virtual void do_process_requests (); + virtual void do_process_music (); public: Beam_engraver (); VIRTUAL_COPY_CONS (Translator); diff --git a/lily/include/beam.hh b/lily/include/beam.hh index aff606c7a9..54f6d04bdc 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -45,8 +45,8 @@ public: protected: - virtual void do_pre_processing (); - virtual void do_post_processing (); + virtual void before_line_breaking (); + virtual void after_line_breaking (); virtual Molecule do_brew_molecule () const; Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const; diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh index 20d5a3f749..791e104f00 100644 --- a/lily/include/break-align-item.hh +++ b/lily/include/break-align-item.hh @@ -17,7 +17,7 @@ class Break_align_item : public Axis_align_item { protected: - virtual void do_pre_processing(); + virtual void before_line_breaking (); public: Break_align_item (); VIRTUAL_COPY_CONS(Score_element); diff --git a/lily/include/breathing-sign-engraver.hh b/lily/include/breathing-sign-engraver.hh index 3c003081e5..ef0fa899fa 100644 --- a/lily/include/breathing-sign-engraver.hh +++ b/lily/include/breathing-sign-engraver.hh @@ -21,7 +21,7 @@ public: protected: virtual bool do_try_music (Music *req_l); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); virtual void do_post_move_processing(); diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh index 83cf87e5e8..ca074df3fa 100644 --- a/lily/include/breathing-sign.hh +++ b/lily/include/breathing-sign.hh @@ -19,7 +19,7 @@ public: VIRTUAL_COPY_CONS(Score_element); Breathing_sign (); protected: - virtual void do_post_processing (); + virtual void after_line_breaking (); virtual Molecule do_brew_molecule () const; }; diff --git a/lily/include/chord-name-engraver.hh b/lily/include/chord-name-engraver.hh index c9a9886f6c..e8b780d383 100644 --- a/lily/include/chord-name-engraver.hh +++ b/lily/include/chord-name-engraver.hh @@ -23,7 +23,7 @@ public: protected: virtual void do_pre_move_processing (); virtual void acknowledge_element (Score_element_info i); - virtual void do_process_requests (); + virtual void do_process_music (); virtual bool do_try_music (Music* m); private: diff --git a/lily/include/clef-item.hh b/lily/include/clef-item.hh index a5d5585db3..60322e19ed 100644 --- a/lily/include/clef-item.hh +++ b/lily/include/clef-item.hh @@ -26,7 +26,7 @@ class Clef_item : public Item { protected: - virtual void do_pre_processing(); + virtual void before_line_breaking (); virtual void do_add_processing (); public: VIRTUAL_COPY_CONS(Score_element); diff --git a/lily/include/collision.hh b/lily/include/collision.hh index 4fe2de3906..f64db66504 100644 --- a/lily/include/collision.hh +++ b/lily/include/collision.hh @@ -29,7 +29,7 @@ protected: Array automatic_shift (); Array forced_shift (); - virtual void do_pre_processing(); + virtual void before_line_breaking (); public: void add_column (Note_column*ncol_l); diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index de7d522f05..9679bf32a4 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -26,6 +26,6 @@ public: Dot_column (); protected: - virtual void do_post_processing (); + virtual void after_line_breaking (); }; #endif // DOT_COLUMN_HH diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 6a36c9ef06..4f3ba7200b 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -22,7 +22,7 @@ class Dots : { protected: virtual Molecule do_brew_molecule () const; - virtual void do_post_processing (); + virtual void after_line_breaking (); public: Dots (); diff --git a/lily/include/extender-engraver.hh b/lily/include/extender-engraver.hh index 28e9dadeb9..9973f41d31 100644 --- a/lily/include/extender-engraver.hh +++ b/lily/include/extender-engraver.hh @@ -39,7 +39,7 @@ public: protected: virtual void acknowledge_element (Score_element_info); virtual void do_removal_processing(); - virtual void do_process_requests(); + virtual void do_process_music(); virtual bool do_try_music (Music*); virtual void do_pre_move_processing(); virtual void do_post_move_processing (); diff --git a/lily/include/extender-spanner.hh b/lily/include/extender-spanner.hh index 0fa11e6f57..d2d0b021ef 100644 --- a/lily/include/extender-spanner.hh +++ b/lily/include/extender-spanner.hh @@ -35,7 +35,7 @@ public: protected: virtual Molecule do_brew_molecule () const; - void do_post_processing (); + void after_line_breaking (); VIRTUAL_COPY_CONS (Score_element); diff --git a/lily/include/font-size-engraver.hh b/lily/include/font-size-engraver.hh index c0fbb35c04..5ebc44dd7b 100644 --- a/lily/include/font-size-engraver.hh +++ b/lily/include/font-size-engraver.hh @@ -23,7 +23,7 @@ class Font_size_engraver : public Engraver { Protected_scm size_; protected: virtual void acknowledge_element (Score_element_info); - virtual void do_process_requests (); + virtual void do_process_music (); public: Font_size_engraver (); diff --git a/lily/include/grace-align-item.hh b/lily/include/grace-align-item.hh index ee8d0ce6f2..028ff63255 100644 --- a/lily/include/grace-align-item.hh +++ b/lily/include/grace-align-item.hh @@ -20,7 +20,7 @@ public: Grace_align_item (); protected: virtual void do_add_processing (); - virtual void do_pre_processing (); + virtual void before_line_breaking (); }; #endif /* GRACE_ALIGN_ITEM_HH */ diff --git a/lily/include/hara-kiri-vertical-group-spanner.hh b/lily/include/hara-kiri-vertical-group-spanner.hh index a6245449dd..bba2981777 100644 --- a/lily/include/hara-kiri-vertical-group-spanner.hh +++ b/lily/include/hara-kiri-vertical-group-spanner.hh @@ -21,7 +21,7 @@ class Hara_kiri_group_spanner : public Axis_group_spanner { public: Hara_kiri_group_spanner (); - virtual void do_post_processing (); + virtual void after_line_breaking (); void add_interesting_item (Item* n); protected: VIRTUAL_COPY_CONS(Score_element); diff --git a/lily/include/hyphen-engraver.hh b/lily/include/hyphen-engraver.hh index d8af602c12..4db4d25bff 100644 --- a/lily/include/hyphen-engraver.hh +++ b/lily/include/hyphen-engraver.hh @@ -38,7 +38,7 @@ public: protected: virtual void acknowledge_element (Score_element_info); virtual void do_removal_processing(); - virtual void do_process_requests(); + virtual void do_process_music(); virtual bool do_try_music (Music*); virtual void do_pre_move_processing(); virtual void do_post_move_processing (); diff --git a/lily/include/hyphen-spanner.hh b/lily/include/hyphen-spanner.hh index 2530a5e116..ec60dee675 100644 --- a/lily/include/hyphen-spanner.hh +++ b/lily/include/hyphen-spanner.hh @@ -28,7 +28,7 @@ protected: virtual Molecule do_brew_molecule () const; Interval do_height () const; - void do_post_processing (); + void after_line_breaking (); VIRTUAL_COPY_CONS (Score_element); diff --git a/lily/include/key-engraver.hh b/lily/include/key-engraver.hh index 6e7850290d..cbd80e8d42 100644 --- a/lily/include/key-engraver.hh +++ b/lily/include/key-engraver.hh @@ -36,7 +36,7 @@ public: protected: virtual bool do_try_music (Music *req_l); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); virtual void do_post_move_processing(); virtual void acknowledge_element (Score_element_info); diff --git a/lily/include/key-performer.hh b/lily/include/key-performer.hh index 335614b91e..535cb3e1bd 100644 --- a/lily/include/key-performer.hh +++ b/lily/include/key-performer.hh @@ -23,7 +23,7 @@ public: protected: void do_print() const; virtual bool do_try_music (Music* req_l); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_pre_move_processing (); private: diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index 3e2063167b..3cfb339ce1 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -49,7 +49,7 @@ public: void add_pitch (Musical_pitch, bool cautionary, bool natural); protected: - virtual void do_pre_processing(); + virtual void before_line_breaking (); virtual Molecule do_brew_molecule() const; }; #endif // LOCALKEYITEM_HH diff --git a/lily/include/lyric-engraver.hh b/lily/include/lyric-engraver.hh index 7ed599e275..1ef2eb7490 100644 --- a/lily/include/lyric-engraver.hh +++ b/lily/include/lyric-engraver.hh @@ -23,7 +23,7 @@ class Lyric_engraver : public Engraver protected: virtual void do_pre_move_processing(); virtual bool do_try_music (Music*); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_post_move_processing (); public: Lyric_engraver (); diff --git a/lily/include/lyric-performer.hh b/lily/include/lyric-performer.hh index 6619ab29ee..89890b4982 100644 --- a/lily/include/lyric-performer.hh +++ b/lily/include/lyric-performer.hh @@ -22,7 +22,7 @@ public: protected: void do_print() const; virtual bool do_try_music (Music* req_l); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing (); private: diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index 527e93fcd6..8dfbba2f5f 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -25,7 +25,7 @@ protected: VIRTUAL_COPY_CONS (Score_element); virtual void do_add_processing (); - virtual void do_post_processing (); + virtual void after_line_breaking (); virtual Array get_rods () const; }; diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh index 48f6215d48..df0876b598 100644 --- a/lily/include/note-column.hh +++ b/lily/include/note-column.hh @@ -17,7 +17,7 @@ (chord) and scripts) as a single entity. */ class Note_column : public Axis_group_item { protected: - virtual void do_post_processing () ; + virtual void after_line_breaking () ; public: static int shift_compare (Note_column *const &, Note_column*const&); diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index fbebc0a404..dcdeca9ca4 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -23,7 +23,7 @@ public: Molecule ledger_line (Interval) const; protected: - virtual void do_pre_processing(); + virtual void before_line_breaking (); virtual Molecule do_brew_molecule() const; }; #endif // NOTEHEAD_HH diff --git a/lily/include/note-heads-engraver.hh b/lily/include/note-heads-engraver.hh index 1d8d667975..39eb3868fe 100644 --- a/lily/include/note-heads-engraver.hh +++ b/lily/include/note-heads-engraver.hh @@ -24,7 +24,7 @@ public: protected: virtual bool do_try_music (Music *req_l) ; - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); }; diff --git a/lily/include/note-performer.hh b/lily/include/note-performer.hh index beaae306d9..f9af35188d 100644 --- a/lily/include/note-performer.hh +++ b/lily/include/note-performer.hh @@ -21,7 +21,7 @@ public: Note_performer(); protected: - virtual void do_process_requests (); + virtual void do_process_music (); virtual bool do_try_music (Music *req_l) ; virtual void do_print () const; virtual void do_pre_move_processing (); diff --git a/lily/include/repeat-engraver.hh b/lily/include/repeat-engraver.hh index f3887077b3..bd8bbd9237 100644 --- a/lily/include/repeat-engraver.hh +++ b/lily/include/repeat-engraver.hh @@ -40,7 +40,7 @@ protected: virtual void acknowledge_element (Score_element_info i); virtual void do_removal_processing (); virtual bool do_try_music (Music *req_l); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); virtual void do_post_move_processing (); void queue_events (); diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index 8de616c71d..eac7a48a0f 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -20,6 +20,6 @@ public: Rest_collision(); protected: - virtual void do_pre_processing(); + virtual void before_line_breaking (); }; #endif // REST_COLLISION_HH diff --git a/lily/include/rest-engraver.hh b/lily/include/rest-engraver.hh index a3b6ced3e3..54d5967480 100644 --- a/lily/include/rest-engraver.hh +++ b/lily/include/rest-engraver.hh @@ -21,7 +21,7 @@ protected: virtual bool do_try_music (Music *); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); - virtual void do_process_requests (); + virtual void do_process_music (); public: VIRTUAL_COPY_CONS(Translator); diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 56b13441a6..21ab46ae03 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -15,7 +15,7 @@ class Rest : public Rhythmic_head { protected: - virtual void do_post_processing (); + virtual void after_line_breaking (); virtual Molecule do_brew_molecule () const; }; #endif // REST_HH diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index 3de4c87ace..2435085d57 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -23,7 +23,7 @@ public: Dots * dots_l () const; int dot_count () const; protected: - virtual void do_post_processing (); + virtual void after_line_breaking (); }; #endif // RHYTHMIC_HEAD_HH diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh index e3bec466ef..8eb39f509b 100644 --- a/lily/include/score-element.hh +++ b/lily/include/score-element.hh @@ -141,14 +141,14 @@ protected: ///executed directly after the item is added to the Paper_score virtual void do_add_processing (); /// do calculations before determining horizontal spacing - virtual void do_pre_processing (); + virtual void before_line_breaking (); /// generate rods & springs virtual void do_space_processing (); virtual void do_breakable_col_processing (); /// do calculations after determining horizontal spacing - virtual void do_post_processing (); + virtual void after_line_breaking (); virtual Link_array get_extra_dependencies () const; diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 4f6e2bca81..9e2b9ded5f 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -18,7 +18,7 @@ public: Script_column(); void add_staff_sided (Item*); protected: - virtual void do_pre_processing (); + virtual void before_line_breaking (); }; diff --git a/lily/include/script.hh b/lily/include/script.hh index b9c0be1238..c6ee25529e 100644 --- a/lily/include/script.hh +++ b/lily/include/script.hh @@ -24,8 +24,8 @@ class Script : public Item public: protected: - virtual void do_pre_processing (); - virtual void do_post_processing (); + virtual void before_line_breaking (); + virtual void after_line_breaking (); Molecule do_brew_molecule () const; }; diff --git a/lily/include/slur-engraver.hh b/lily/include/slur-engraver.hh index d82cb95cdb..f639783421 100644 --- a/lily/include/slur-engraver.hh +++ b/lily/include/slur-engraver.hh @@ -19,7 +19,7 @@ class Slur_engraver :public Engraver { void set_melisma (bool); protected: virtual bool do_try_music (Music*); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void acknowledge_element (Score_element_info); virtual void do_pre_move_processing(); virtual void do_post_move_processing(); diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 93844719cc..cb202f1e93 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -30,7 +30,7 @@ protected: Drul_array dx_f_drul_; virtual Direction get_default_dir () const; - virtual void do_post_processing (); + virtual void after_line_breaking (); virtual void do_add_processing (); Array get_rods () const; diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index 8100bbafed..bc93e8fe3d 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -36,9 +36,9 @@ protected: static Interval width_callback(Dimension_cache const*) ; static Interval height_callback(Dimension_cache const*) ; - virtual void do_pre_processing(); - virtual void do_post_processing(); - virtual Molecule do_brew_molecule() const; + virtual Real get_bar_size () const; + virtual void before_line_breaking (); + virtual void after_line_breaking (); }; #endif // SPAN_BAR_HH diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh index 4c552e081f..12abd08cfb 100644 --- a/lily/include/staff-performer.hh +++ b/lily/include/staff-performer.hh @@ -30,7 +30,7 @@ protected: virtual void play_element (Audio_element* p); virtual void do_removal_processing (); virtual void do_creation_processing (); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_pre_move_processing (); private: diff --git a/lily/include/stem.hh b/lily/include/stem.hh index b31627019f..8eee7cee7e 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -89,7 +89,7 @@ protected: protected: Molecule flag () const; - virtual void do_pre_processing(); + virtual void before_line_breaking(); static Interval dim_callback (Dimension_cache const*); virtual Molecule do_brew_molecule() const; diff --git a/lily/include/tempo-performer.hh b/lily/include/tempo-performer.hh index fc7be5139a..086b731cd3 100644 --- a/lily/include/tempo-performer.hh +++ b/lily/include/tempo-performer.hh @@ -23,7 +23,7 @@ public: protected: void do_print() const; virtual bool do_try_music (Music* req_l); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing (); private: diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index d4de3697df..cdbe522201 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -20,7 +20,7 @@ public: void add_tie (Tie*); Tie_column (); protected: - virtual void do_post_processing (); + virtual void after_line_breaking (); void set_directions (); }; diff --git a/lily/include/tie-performer.hh b/lily/include/tie-performer.hh index 8e3d9d50e8..6b1f924470 100644 --- a/lily/include/tie-performer.hh +++ b/lily/include/tie-performer.hh @@ -54,7 +54,7 @@ protected: virtual void do_pre_move_processing (); virtual void acknowledge_element (Audio_element_info); virtual bool do_try_music (Music*); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void process_acknowledged (); }; diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 53dc0733ec..4240193247 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -37,7 +37,7 @@ protected: Drul_array dx_f_drul_; virtual void do_add_processing (); - virtual void do_post_processing (); + virtual void after_line_breaking (); virtual Array get_rods () const; diff --git a/lily/include/time-signature-engraver.hh b/lily/include/time-signature-engraver.hh index aa35e921ee..11959f816f 100644 --- a/lily/include/time-signature-engraver.hh +++ b/lily/include/time-signature-engraver.hh @@ -17,7 +17,7 @@ */ class Time_signature_engraver : public Engraver { protected: - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); public: VIRTUAL_COPY_CONS(Translator); diff --git a/lily/include/time-signature-performer.hh b/lily/include/time-signature-performer.hh index c2c8330715..7226d1c086 100644 --- a/lily/include/time-signature-performer.hh +++ b/lily/include/time-signature-performer.hh @@ -23,7 +23,7 @@ public: protected: void do_print() const; virtual bool do_try_music (Music* req_l); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing (); private: diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh index 4309878562..c60d4de3b5 100644 --- a/lily/include/timing-translator.hh +++ b/lily/include/timing-translator.hh @@ -26,7 +26,7 @@ public: protected: virtual void do_creation_processing (); virtual bool do_try_music (Music *req_l); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void do_pre_move_processing(); virtual void do_post_move_processing(); diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index 11df320ce8..b2cba74b19 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -76,7 +76,7 @@ protected: bool try_music_on_nongroup_children (Music *m); virtual void do_print () const; - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_add_processing (); virtual bool do_try_music (Music* req_l); virtual void do_pre_move_processing(); diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 7740fc7a9c..f7afd50cfa 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -91,7 +91,7 @@ protected: virtual void do_print () const; virtual void do_pre_move_processing(); virtual void do_post_move_processing(); - virtual void do_process_requests () ; + virtual void do_process_music () ; virtual void do_creation_processing() ; virtual void do_removal_processing(); }; diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index a38a9dcb4c..b851d1f626 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -31,7 +31,7 @@ protected: virtual Molecule do_brew_molecule () const; VIRTUAL_COPY_CONS(Score_element); virtual void do_add_processing (); - virtual void do_post_processing (); + virtual void after_line_breaking (); virtual Direction get_default_dir () const; }; diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index bdc42ffdf4..9630477fa8 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -27,7 +27,7 @@ protected: virtual void do_add_processing (); static Interval dim_callback (Dimension_cache const*); - virtual void do_post_processing (); + virtual void after_line_breaking (); }; #endif // VOLTA_SPANNER_HH diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 161f323b0f..b9f0ec4e29 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -106,7 +106,7 @@ Key_engraver::acknowledge_element (Score_element_info info) } void -Key_engraver::do_process_requests () +Key_engraver::do_process_music () { if (keyreq_l_) { diff --git a/lily/key-performer.cc b/lily/key-performer.cc index d026cf590d..6c4132a451 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -35,7 +35,7 @@ Key_performer::do_print () const } void -Key_performer::do_process_requests () +Key_performer::do_process_music () { if (key_req_l_) { diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 228ec8d157..bfd5390b9c 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -34,7 +34,7 @@ struct Local_key_engraver : Engraver { Local_key_item *key_item_p_; protected: VIRTUAL_COPY_CONS(Translator); - virtual void do_process_requests(); + virtual void do_process_music(); virtual void acknowledge_element (Score_element_info); virtual void do_pre_move_processing(); virtual void do_creation_processing (); @@ -218,7 +218,7 @@ Local_key_engraver::acknowledge_element (Score_element_info info) } void -Local_key_engraver::do_process_requests() +Local_key_engraver::do_process_music() { if (time_trans_l_ && !time_trans_l_->measure_position ()) { diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 249abd0743..354e49cd1e 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -33,7 +33,7 @@ Local_key_item::add_pitch (Musical_pitch p, bool cautionary, bool natural) void -Local_key_item::do_pre_processing() +Local_key_item::before_line_breaking () { accidental_arr_.sort (Local_key_cautionary_tuple::compare); } @@ -126,7 +126,7 @@ Local_key_item::do_brew_molecule() const Box b(Interval (0, gh_scm2double (pads[d]) * note_distance), Interval (0,0)); - Molecule m (lookup_l ()->fill (b)); + Molecule m (lookup_l ()->blank (b)); mol.add_at_edge (X_AXIS, d, m, 0); } while ( flip (&d)!= LEFT); } diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 60c59e8141..61e12a1c51 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -36,7 +36,7 @@ Lyric_engraver::do_try_music (Music*r) } void -Lyric_engraver::do_process_requests() +Lyric_engraver::do_process_music() { if (req_l_) { diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 5a5be59567..e07fe0f4fe 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -27,7 +27,7 @@ Lyric_performer::do_print () const } void -Lyric_performer::do_process_requests () +Lyric_performer::do_process_music () { if (lreq_arr_.size () && lreq_arr_[0]->text_str_.length_i ()) { diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 3c3777d5e8..1158daec6e 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -20,7 +20,7 @@ public: VIRTUAL_COPY_CONS(Translator); protected: virtual bool do_try_music (Music *req_l); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_post_move_processing (); private: Mark_req * mark_req_l_; @@ -59,7 +59,7 @@ Mark_engraver::do_try_music (Music* r_l) } void -Mark_engraver::do_process_requests () +Mark_engraver::do_process_music () { if (mark_req_l_) { diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 2ed4779388..de6975998a 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -26,7 +26,7 @@ public: protected: virtual void acknowledge_element (Score_element_info i); - virtual void do_process_requests (); + virtual void do_process_music (); virtual bool do_try_music (Music*); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); @@ -87,7 +87,7 @@ Multi_measure_rest_engraver::do_try_music (Music* req_l) void -Multi_measure_rest_engraver::do_process_requests () +Multi_measure_rest_engraver::do_process_music () { if (new_req_l_ && stop_req_l_) stop_req_l_ = 0; diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index cba889d3f7..6001e531bf 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -40,7 +40,7 @@ Multi_measure_rest::do_brew_molecule () const Direction d = LEFT; do { - Item * col = spanned_drul_[d]->column_l (); + Item * col = get_bound (d)->column_l (); Interval coldim = col->extent (X_AXIS) + col->relative_coordinate (0, X_AXIS); @@ -51,7 +51,7 @@ Multi_measure_rest::do_brew_molecule () const Molecule mol; Real x_off = 0.0; - Real rx = spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS); + Real rx = get_bound (LEFT)->relative_coordinate (0, X_AXIS); /* we gotta stay clear of sp_iv, so move a bit to the right if needed. @@ -143,15 +143,15 @@ Multi_measure_rest::do_add_processing () { Link_array column_arr (Group_interface__extract_elements (this, (Item*)0, "columns")); - set_bounds (LEFT, column_arr[0 >? column_arr.size () - 2]); - set_bounds (RIGHT, column_arr.top ()); + set_bound (LEFT, column_arr[0 >? column_arr.size () - 2]); + set_bound (RIGHT, column_arr.top ()); } // set columns to SCM_EOL? } void -Multi_measure_rest::do_post_processing () +Multi_measure_rest::after_line_breaking () { if (!gh_pair_p (get_elt_property ("columns"))) set_elt_property ("transparent", SCM_BOOL_T); @@ -175,14 +175,14 @@ Multi_measure_rest::get_rods () const { Array a; - if (!(spanned_drul_[LEFT] && spanned_drul_[RIGHT])) + if (!(get_bound (LEFT) && get_bound (RIGHT))) { programming_error ("Multi_measure_rest::get_rods (): I am not spanned!"); return a; } - Item * l = spanned_drul_[LEFT]->column_l (); - Item * r = spanned_drul_[RIGHT]->column_l (); + Item * l = get_bound (LEFT)->column_l (); + Item * r = get_bound (RIGHT)->column_l (); Item * lb = l->find_broken_piece (RIGHT); Item * rb = r->find_broken_piece (LEFT); diff --git a/lily/note-column.cc b/lily/note-column.cc index 8dca8fc061..ab801410ff 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -147,7 +147,7 @@ Note_column::set_dotcol (Dot_column *d) */ void -Note_column::do_post_processing () +Note_column::after_line_breaking () { if (!stem_l () || !rest_b ()) return; diff --git a/lily/note-head.cc b/lily/note-head.cc index 188d967f3b..ea39db1104 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -53,7 +53,7 @@ Note_head::ledger_line (Interval xwid) const void -Note_head::do_pre_processing () +Note_head::before_line_breaking () { // 8 ball looks the same as 4 ball: String type; diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 4a397581a3..9dcc875192 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -53,7 +53,7 @@ Note_heads_engraver::do_try_music (Music *m) } void -Note_heads_engraver::do_process_requests() +Note_heads_engraver::do_process_music() { if (note_p_arr_.size ()) return ; diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index a87cea19ff..4c629dd2b7 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -18,7 +18,7 @@ public: Link_array req_l_arr_; Link_array texts_; virtual bool do_try_music (Music*m); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_pre_move_processing (); }; @@ -35,7 +35,7 @@ Note_name_engraver::do_try_music (Music *m) void -Note_name_engraver::do_process_requests () +Note_name_engraver::do_process_music () { String s ; for (int i=0; i < req_l_arr_.size (); i++) diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 6e2bab25ca..c0f8cf48ef 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -31,7 +31,7 @@ Note_performer::do_print () const } void -Note_performer::do_process_requests () +Note_performer::do_process_music () { if (note_req_l_arr_.size ()) { diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc index ef5a60c3b0..dcf545cf3f 100644 --- a/lily/repeat-engraver.cc +++ b/lily/repeat-engraver.cc @@ -137,7 +137,7 @@ Repeat_engraver::queue_events () } void -Repeat_engraver::do_process_requests () +Repeat_engraver::do_process_music () { if (repeated_music_l_ && !done_this_one_b_) { diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 07ab3c764a..4ef293f8f1 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -33,7 +33,7 @@ Rest_collision::add_column (Note_column *nc_l) } void -Rest_collision::do_pre_processing() +Rest_collision::before_line_breaking () { Link_array rest_l_arr = Group_interface__extract_elements (this, (Note_column*) 0, "rests"); diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 5fe98cf293..fce8f71bbd 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -42,7 +42,7 @@ Rest_engraver::do_pre_move_processing () } void -Rest_engraver::do_process_requests () +Rest_engraver::do_process_music () { if (rest_req_l_ && !rest_p_) { diff --git a/lily/rest.cc b/lily/rest.cc index 783372390c..0c4aafee66 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -17,7 +17,7 @@ void -Rest::do_post_processing () +Rest::after_line_breaking () { if (balltype_i () == 0) { diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc index a96a750f74..015fa2f9aa 100644 --- a/lily/rhythmic-head.cc +++ b/lily/rhythmic-head.cc @@ -49,7 +49,7 @@ Rhythmic_head::dot_count () const } void -Rhythmic_head::do_post_processing () +Rhythmic_head::after_line_breaking () { if (Dots *d = dots_l ()) { diff --git a/lily/score-element.cc b/lily/score-element.cc index bdc28e626a..141d95a22d 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -274,7 +274,7 @@ Score_element::do_break_processing() } void -Score_element::do_post_processing() +Score_element::after_line_breaking () { } @@ -285,7 +285,7 @@ Score_element::do_breakable_col_processing() } void -Score_element::do_pre_processing() +Score_element::before_line_breaking () { } @@ -312,9 +312,9 @@ Score_element::do_brew_molecule() const } else { - Interval emp; - emp.set_empty (); - return lookup_l ()->fill (Box (emp,emp)); + Molecule m ; + m.set_empty (true); + return m; } } @@ -555,28 +555,28 @@ Score_element::fixup_refpoint () for (int a = X_AXIS; a < NO_AXES; a ++) { Axis ax = (Axis)a; - Score_element * par = parent_l (ax); + Score_element * parent = parent_l (ax); - if (!par) + if (!parent) continue; - if (par->line_l () != line_l ()) + if (parent->line_l () != line_l ()) { - Score_element * newpar = par->find_broken_piece (line_l ()); - set_parent (newpar, ax); + Score_element * newparent = parent->find_broken_piece (line_l ()); + set_parent (newparent, ax); } if (Item * i = dynamic_cast (this)) { - Item *pari = dynamic_cast (par); + Item *parenti = dynamic_cast (parent); - if (pari && i) + if (parenti && i) { Direction my_dir = i->break_status_dir () ; - if (my_dir!= pari->break_status_dir()) + if (my_dir!= parenti->break_status_dir()) { - Item *newpar = pari->find_broken_piece (my_dir); - set_parent (newpar, ax); + Item *newparent = parenti->find_broken_piece (my_dir); + set_parent (newparent, ax); } } } diff --git a/lily/script-column.cc b/lily/script-column.cc index 5c892091a7..a386058d87 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -41,7 +41,7 @@ staff_side_compare (Item * const &i1, } void -Script_column::do_pre_processing () +Script_column::before_line_breaking () { Drul_array > arrs; Link_array staff_sided diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 74d8b93f9f..5498b5b7f6 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -25,7 +25,7 @@ public: Script_engraver(); protected: virtual bool do_try_music (Music*); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); virtual void acknowledge_element (Score_element_info); @@ -54,7 +54,7 @@ Script_engraver::do_try_music (Music *r_l) } void -Script_engraver::do_process_requests() +Script_engraver::do_process_music() { for (int i=0; i < script_req_l_arr_.size(); i++) { diff --git a/lily/script.cc b/lily/script.cc index 7e19e16940..6f96f1b7b8 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -39,7 +39,7 @@ Script::get_molecule(Direction d) const void -Script::do_pre_processing () +Script::before_line_breaking () { /* center my self on the note head. @@ -49,7 +49,7 @@ Script::do_pre_processing () } void -Script::do_post_processing () +Script::after_line_breaking () { Side_position_interface i (this); Direction d = i.get_direction (); diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 61a7d6ce03..0b1a8c6839 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -63,7 +63,7 @@ Slur_engraver::do_removal_processing () } void -Slur_engraver::do_process_requests() +Slur_engraver::do_process_music() { Array start_slur_l_arr_; for (int i=0; i< new_slur_req_l_arr_.size(); i++) diff --git a/lily/slur.cc b/lily/slur.cc index 679ece65b5..c2166932a0 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -121,8 +121,8 @@ Slur_bezier_bow::minimise_enclosed_area (Paper_def* paper_l, Real default_height) { Real length = curve_.control_[3][X_AXIS]; - Real bbc = paper_l->get_var ("bezier_beautiful"); - Real beautiful = length * default_height / bbc; + Real sb = paper_l->get_var ("slur_beautiful"); + Real beautiful = length * default_height * sb; DEBUG_OUT << to_str ("Beautiful: %f\n", beautiful); DEBUG_OUT << to_str ("Length: %f\n", length); @@ -302,9 +302,9 @@ Slur::do_add_processing () if (encompass_arr.size ()) { - set_bounds (LEFT, encompass_arr[0]); + set_bound (LEFT, encompass_arr[0]); if (encompass_arr.size () > 1) - set_bounds (RIGHT, encompass_arr.top ()); + set_bound (RIGHT, encompass_arr.top ()); } } @@ -352,7 +352,7 @@ Slur::encompass_offset (Note_column const* col) const } void -Slur::do_post_processing () +Slur::after_line_breaking () { set_extremities (); set_control_points (); @@ -411,7 +411,7 @@ Slur::set_extremities () dx_f_drul_[d] = 0; dy_f_drul_[d] = 0; - if ((note_column_drul[d] == spanned_drul_[d]) + if ((note_column_drul[d] == get_bound (d)) && note_column_drul[d]->first_head () && (note_column_drul[d]->stem_l ())) { @@ -425,7 +425,7 @@ Slur::set_extremities () && !((my_dir == stem_l->get_direction ()) && stem_l->beam_l () && (stem_l->beam_count (-d) >= 1))) { - dx_f_drul_[d] = spanned_drul_[d]->extent (X_AXIS).length () / 2; + dx_f_drul_[d] = get_bound (d)->extent (X_AXIS).length () / 2; dx_f_drul_[d] -= d * x_gap_f; if (stem_l->get_direction () != my_dir) @@ -445,7 +445,7 @@ Slur::set_extremities () else { dx_f_drul_[d] = stem_l->hpos_f () - - spanned_drul_[d]->relative_coordinate (0, X_AXIS); + - get_bound (d)->relative_coordinate (0, X_AXIS); /* side attached to beamed stem */ @@ -503,7 +503,7 @@ Slur::set_extremities () if (fix_broken_b) { - Direction d = (encompass_arr.top () != spanned_drul_[RIGHT]) ? + Direction d = (encompass_arr.top () != get_bound (RIGHT)) ? RIGHT : LEFT; dy_f_drul_[d] = info_drul[d][Y_AXIS]; if (!interstaff_b) @@ -569,7 +569,7 @@ Slur::get_encompass_offset_arr () const int cross_count = cross_staff_count (); bool cross_b = cross_count && cross_count < encompass_arr.size (); - if (encompass_arr[0] != spanned_drul_[LEFT]) + if (encompass_arr[0] != get_bound (LEFT)) { first--; Real is = calc_interstaff_dist (encompass_arr[0], this); @@ -580,7 +580,7 @@ Slur::get_encompass_offset_arr () const /* right is broken edge */ - if (encompass_arr.top () != spanned_drul_[RIGHT]) + if (encompass_arr.top () != get_bound (RIGHT)) { last++; } @@ -603,7 +603,9 @@ Slur::get_rods () const { Array a; Rod r; - r.item_l_drul_ = spanned_drul_; + r.item_l_drul_[LEFT] = get_bound (LEFT); + r.item_l_drul_[RIGHT] = get_bound (RIGHT); + r.distance_f_ = paper_l ()->get_var ("slur_x_minimum"); a.push (r); @@ -612,31 +614,6 @@ Slur::get_rods () const -#if 0 -SCM -ugly_scm (Bezier b) -{ - b.translate (-b.control_[0]); - Real alpha = b.control_[3].arg (); - - b.rotate ( -alpha); - if (b.control_[1][Y_AXIS] < 0) - { - b.control_[1][Y_AXIS] *= -1; - b.control_[2][Y_AXIS] *= -1; - } - - Real len = b.control_[3][X_AXIS]; - Real indent = 10 *b.control_[1][X_AXIS] / len ; - Real ht = 10 *b.control_[1][Y_AXIS] / len ; - - SCM res = scm_eval (scm_listify (ly_symbol2scm ("slur-ugly"), gh_double2scm (indent), gh_double2scm (ht), SCM_UNDEFINED )); - - return res; -} -#endif - - /* Ugh should have dash-length + dash-period */ @@ -653,19 +630,6 @@ Slur::do_brew_molecule () const else a = lookup_l ()->slur (one, directional_element (this).get () * thick, thick); -#if 0 - SCM u = ugly_scm (one); - if (gh_pair_p (u)) - { - Molecule mark = lookup_l ()-> text ( "roman", - to_str (gh_scm2double (gh_car (u)), "%0.2f") + "," + - to_str(gh_scm2double (gh_cdr (u)), "%0.2f"), - paper_l ()); - - mark.translate_axis (20 , Y_AXIS); - a.add_molecule (mark); - } -#endif return a; } diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 0ee3142afd..4aacb94248 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -31,16 +31,18 @@ Span_bar::width_callback (Dimension_cache const * c) { Span_bar* s= dynamic_cast (c->element_l ()); String gl = ly_scm2string (s->get_elt_property ("glyph")); - - Molecule m = s->lookup_l ()->bar (gl, 40 PT, s->paper_l ()); + + /*urg. + */ + Molecule m = s->compound_barline (gl, 40 PT); return m.extent (X_AXIS); } void -Span_bar::do_pre_processing () +Span_bar::before_line_breaking () { - Bar::do_pre_processing (); + Bar::before_line_breaking (); evaluate_empty (); @@ -48,9 +50,9 @@ Span_bar::do_pre_processing () } void -Span_bar::do_post_processing () +Span_bar::after_line_breaking () { - Bar::do_post_processing (); + Bar::after_line_breaking (); Interval i(get_spanned_interval ()); translate_axis (i.center (), Y_AXIS); @@ -88,6 +90,10 @@ Span_bar::evaluate_empty () type_str= ".|."; } } + + /* + uhh. should do something with type_str ?!! + */ } Interval @@ -113,6 +119,7 @@ Span_bar::get_spanned_interval () const y_int.unite (y + iv); } } + return y_int; } @@ -123,29 +130,21 @@ Span_bar::height_callback (Dimension_cache const *c) return s->get_spanned_interval (); } -Molecule -Span_bar::do_brew_molecule () const +Real +Span_bar::get_bar_size () const { - Interval iv (get_spanned_interval ()); - Molecule output; - SCM s = get_elt_property ("glyph"); - if (gh_string_p (s) && !iv.empty_b()) - { - output.add_molecule (lookup_l ()->bar (ly_scm2string (s), - iv.length (), - paper_l ())); - } - else - { - programming_error("Huh? My children deflated (FIXME)"); - } - return output; + Interval iv (get_spanned_interval ()); + if (iv.empty_b ()) + { + programming_error("Huh? My children deflated (FIXME)"); + iv = Interval (0,0); + } + return iv.length (); } - - Span_bar::Span_bar () { + group (this).set_interface (); dim_cache_[X_AXIS]->set_callback (width_callback); dim_cache_[Y_AXIS]->set_callback (height_callback); } diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 208da51a18..bebb642468 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -45,7 +45,7 @@ Staff_performer::do_creation_processing () } void -Staff_performer::do_process_requests () +Staff_performer::do_process_music () { String str = new_instrument_str (); if (str.length_i ()) @@ -55,7 +55,7 @@ Staff_performer::do_process_requests () instrument_p_ = new Audio_instrument (str); announce_element (Audio_element_info (instrument_p_, 0)); } - Performer_group_performer::do_process_requests (); + Performer_group_performer::do_process_music (); } void diff --git a/lily/stem.cc b/lily/stem.cc index ce3312a9b1..2b9ca36469 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -101,6 +101,7 @@ Stem::get_direction () const { Stem * me = (Stem*) this; d = get_default_dir (); + // urg, AAARGH! directional_element (me).set (d); } return d ; @@ -366,7 +367,7 @@ Stem::position_noteheads () } void -Stem::do_pre_processing () +Stem::before_line_breaking () { stem_end_position (); // ugh. Trigger direction calc. position_noteheads (); diff --git a/lily/super-element.cc b/lily/super-element.cc index c46d963f21..ee544eafae 100644 --- a/lily/super-element.cc +++ b/lily/super-element.cc @@ -36,7 +36,7 @@ enum Score_element_status { void Super_element::pre_processing () { - calculate_dependencies (PRECALCED, PRECALCING, &Score_element::do_pre_processing); + calculate_dependencies (PRECALCED, PRECALCING, &Score_element::before_line_breaking); } void @@ -56,18 +56,13 @@ Super_element::breakable_col_processing () // calculate_dependencies (PREBROKEN_SECOND, PREBROKEN_SECOND, &Score_element::handle_prebroken_dependents); } -void -Super_element::break_processing () -{ - calculate_dependencies (BROKEN, BROKEN, &Score_element::do_break_processing); -} void Super_element::post_processing () { // calculate_dependencies (BROKEN_SECOND, BROKEN_SECOND, // &Score_element::handle_broken_dependents); - calculate_dependencies (POSTCALCED, POSTCALCING, &Score_element::do_post_processing); + calculate_dependencies (POSTCALCED, POSTCALCING, &Score_element::after_line_breaking); } void diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 3463d3e8e4..b728730947 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -32,7 +32,7 @@ Tempo_performer::do_print () const } void -Tempo_performer::do_process_requests () +Tempo_performer::do_process_music () { if (tempo_req_l_) { diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 194b779774..ad69deef94 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -30,7 +30,7 @@ protected: virtual bool do_try_music (Music* m); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void acknowledge_element (Score_element_info); }; @@ -72,7 +72,7 @@ Text_engraver::acknowledge_element (Score_element_info i) } void -Text_engraver::do_process_requests () +Text_engraver::do_process_music () { for (int i=0; i < reqs_.size (); i++) { diff --git a/lily/tie-column.cc b/lily/tie-column.cc index f23d218d93..78d6b487c3 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -27,8 +27,8 @@ Tie_column::add_tie (Tie *s) Group_interface g (this, "ties"); if (!g.count ()) { - set_bounds (LEFT, s->head (LEFT)); - set_bounds (RIGHT, s->head (RIGHT)); + set_bound (LEFT, s->head (LEFT)); + set_bound (RIGHT, s->head (RIGHT)); } group (this, "ties").add_element (s); @@ -92,7 +92,7 @@ Tie_column::set_directions () } void -Tie_column::do_post_processing () +Tie_column::after_line_breaking () { set_directions (); } diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 9ad9be2236..273d66843e 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -57,7 +57,7 @@ protected: virtual void do_pre_move_processing (); virtual void acknowledge_element (Score_element_info); virtual bool do_try_music (Music*); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void process_acknowledged (); public: @@ -110,7 +110,7 @@ Tie_engraver::acknowledge_element (Score_element_info i) } void -Tie_engraver::do_process_requests () +Tie_engraver::do_process_music () { if (req_l_) { diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index b9109b9d86..9b5afbc491 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -47,7 +47,7 @@ Tie_performer::acknowledge_element (Audio_element_info i) } void -Tie_performer::do_process_requests () +Tie_performer::do_process_music () { if (req_l_) { diff --git a/lily/tie.cc b/lily/tie.cc index 87de462d73..6735059d29 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -26,7 +26,7 @@ Tie::set_head (Direction d, Item * head_l) assert (!head (d)); index_set_cell (get_elt_property ("heads"), d, head_l->self_scm_); - set_bounds (d, head_l); + set_bound (d, head_l); add_dependency (head_l); } @@ -92,7 +92,7 @@ Tie::do_add_processing() } void -Tie::do_post_processing() +Tie::after_line_breaking () { if (!head (LEFT) && !head (RIGHT)) { @@ -179,7 +179,10 @@ Tie::get_rods () const { Array a; Rod r; - r.item_l_drul_ = spanned_drul_; + + r.item_l_drul_ [LEFT]=get_bound (LEFT); + r.item_l_drul_ [RIGHT]=get_bound (RIGHT); + r.distance_f_ = paper_l ()->get_var ("tie_x_minimum"); a.push (r); return a; diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 0e6f874f1f..f485c22afd 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -18,7 +18,7 @@ Time_signature_engraver::Time_signature_engraver() } void -Time_signature_engraver::do_process_requests() +Time_signature_engraver::do_process_music() { Translator * result = daddy_grav_l()->get_simple_translator ("Timing_engraver"); // ugh diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 3db298cdc4..aeed66b806 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -32,7 +32,7 @@ Time_signature_performer::do_print () const } void -Time_signature_performer::do_process_requests () +Time_signature_performer::do_process_music () { if (time_signature_req_l_) { diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 7e49f77f2e..4ef6f4df26 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -54,7 +54,7 @@ Timing_translator::time_signature_req_l() const } void -Timing_translator::do_process_requests() +Timing_translator::do_process_music() { for (int i=0; i < timing_req_l_arr_.size (); i++) { diff --git a/lily/translator-group.cc b/lily/translator-group.cc index c76e68e884..64851dfc19 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -388,7 +388,7 @@ Translator_group::do_post_move_processing () } void -Translator_group::do_process_requests () +Translator_group::do_process_music () { each (&Translator::process_requests); } diff --git a/lily/translator.cc b/lily/translator.cc index 28e2b4c31b..4840b898c4 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -145,7 +145,7 @@ Translator::process_requests () return; status = PROCESSED_REQS; - do_process_requests (); + do_process_music (); } void @@ -182,7 +182,7 @@ Translator:: do_pre_move_processing(){} void Translator::do_post_move_processing(){} void -Translator::do_process_requests () {} +Translator::do_process_music () {} void Translator::do_creation_processing() {} void diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 2430e7b37c..1dccd22122 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -34,7 +34,7 @@ protected: virtual void do_removal_processing (); virtual void acknowledge_element (Score_element_info); virtual bool do_try_music (Music*r); - virtual void do_process_requests (); + virtual void do_process_music (); virtual void do_post_move_processing (); }; @@ -62,7 +62,7 @@ Tuplet_engraver::do_try_music (Music *r) } void -Tuplet_engraver::do_process_requests () +Tuplet_engraver::do_process_music () { SCM v = get_property ("tupletInvisible"); if (to_boolean (v)) diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc index 5447595709..ab38ee1514 100644 --- a/lily/tuplet-spanner.cc +++ b/lily/tuplet-spanner.cc @@ -116,8 +116,8 @@ Tuplet_spanner::do_add_processing () Link_array column_arr= Group_interface__extract_elements (this, (Note_column*)0, "columns"); - set_bounds (LEFT, column_arr[0]); - set_bounds (RIGHT, column_arr.top ()); + set_bound (LEFT, column_arr[0]); + set_bound (RIGHT, column_arr.top ()); } } @@ -189,7 +189,7 @@ Tuplet_spanner::calc_dy (Real * dy) const } void -Tuplet_spanner::do_post_processing () +Tuplet_spanner::after_line_breaking () { Link_array column_arr= Group_interface__extract_elements (this, (Note_column*)0, "columns"); @@ -223,8 +223,8 @@ calc_position_and_height (&offset,&dy); Score_element *b = unsmob_element (gh_car (bs)); Beam * beam_l = dynamic_cast (b); if (!broken_b () - && spanned_drul_[LEFT]->column_l () == beam_l->spanned_drul_[LEFT]->column_l () - && spanned_drul_[RIGHT]->column_l () == beam_l->spanned_drul_[RIGHT]->column_l ()) + && get_bound (LEFT)->column_l () == beam_l->get_bound (LEFT)->column_l () + && get_bound (RIGHT)->column_l () == beam_l->get_bound (RIGHT)->column_l ()) set_elt_property ("parallel-beam", SCM_BOOL_T); } } diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index 9f5427a244..743609de93 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -114,8 +114,8 @@ Volta_spanner::do_add_processing () if (bar_arr.size ()) { - set_bounds (LEFT, bar_arr[0]); - set_bounds (RIGHT, bar_arr.top ()); + set_bound (LEFT, bar_arr[0]); + set_bound (RIGHT, bar_arr.top ()); } } @@ -137,7 +137,7 @@ Volta_spanner::dim_callback (Dimension_cache const *c) } void -Volta_spanner::do_post_processing () +Volta_spanner::after_line_breaking () { Link_array bar_arr = Group_interface__extract_elements (this, (Bar*)0, "bars"); -- 2.39.5