From: fred Date: Tue, 26 Mar 2002 22:43:10 +0000 (+0000) Subject: lilypond-1.3.4 X-Git-Tag: release/1.5.59~2003 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dea165d760749a126b782eeebede17ea896b3416;p=lilypond.git lilypond-1.3.4 --- diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 2db31f2b91..e7df04ae89 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -18,7 +18,7 @@ Bar_number_engraver::Bar_number_engraver() axis_ = Y_AXIS; type_ = "barNumber"; visibility_lambda_ - = ly_ch_C_eval_scm ("postbreak_only_visibility"); + = ly_ch_C_eval_scm ("postbreak-only-visibility"); } void diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index 21de711e9a..c8becdc046 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -25,7 +25,7 @@ Bar_script_engraver::Bar_script_engraver () text_p_ =0; hang_on_clef_b_ = false; visibility_lambda_ - = ly_ch_C_eval_scm ("non_postbreak_visibility"); + = ly_ch_C_eval_scm ("non-postbreak-visibility"); } void @@ -162,7 +162,7 @@ Bar_script_engraver::create_items (Request *rq) { staff_side_p_ ->set_elt_property ("padding", - gh_double2scm(paper_l ()->get_realvar (gh_symbol2scm("interline")))); + gh_double2scm(paper_l ()->get_var ("interline"))); } staff_side_p_->set_elt_property ("visibility-lambda", diff --git a/lily/base-span-bar-engraver.cc b/lily/base-span-bar-engraver.cc index 53800c6681..24ba35b14b 100644 --- a/lily/base-span-bar-engraver.cc +++ b/lily/base-span-bar-engraver.cc @@ -52,7 +52,7 @@ Base_span_bar_engraver::acknowledge_element (Score_element_info i) { spanbar_p_ = get_span_bar_p(); spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS); - String visnam = String(name()) + "_visibility"; + String visnam = String(name()) + "-visibility"; spanbar_p_->set_elt_property ("visibility-lambda", ly_ch_C_eval_scm (visnam.ch_C())); diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 2259c17097..df9c9a70bd 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -45,10 +45,6 @@ Breathing_sign_engraver::do_process_requests() if(breathing_sign_req_l_) { breathing_sign_p_ = new Breathing_sign; - SCM prop = get_property ("verticalDirection", 0); - if(isdir_b(prop)) - breathing_sign_p_->set_vertical_position(to_dir (prop)); - announce_element (Score_element_info (breathing_sign_p_, breathing_sign_req_l_)); } } diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 2e6ebde757..3578e06210 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -23,18 +23,9 @@ Breathing_sign::Breathing_sign () { set_direction (UP); set_elt_property ("breakable", SCM_BOOL_T); - set_elt_property ("visibility-lambda", - ly_ch_C_eval_scm ("non_postbreak_visibility")); } -void -Breathing_sign::set_vertical_position (Direction updown) -{ - assert(updown >= -1 && updown <= +1); - if(updown != 0) - set_direction (updown); -} Molecule* Breathing_sign::do_brew_molecule_p () const diff --git a/lily/include/directional-element.hh b/lily/include/directional-element.hh new file mode 100644 index 0000000000..a94bfced9d --- /dev/null +++ b/lily/include/directional-element.hh @@ -0,0 +1,25 @@ +/* + directional-element.hh -- declare Directional_element + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ + +#ifndef DIRECTIONAL_ELEMENT_HH +#define DIRECTIONAL_ELEMENT_HH + +#include "score-element.hh" + +struct Directional_element : public virtual Score_element +{ + void set_direction (Direction d); + Direction get_direction () const; + + VIRTUAL_COPY_CONS(Score_element); + Directional_element (); +}; + +#endif /* DIRECTIONAL_ELEMENT_HH */ + diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index e5c53f74f8..c7b1675fa1 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -89,10 +89,10 @@ Key_engraver::acknowledge_element (Score_element_info info) { bool def = (!item_p_); create_key (); - if (def) + if (!def) { item_p_->set_elt_property ("visibility-lambda", - ly_ch_C_eval_scm ("postbreak_only_visibility")); + ly_ch_C_eval_scm ("all-visibility")); } } diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 6795c9d01f..ae15cd1d65 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -104,18 +104,8 @@ Slur_engraver::do_process_requests() void Slur_engraver::do_pre_move_processing() { - SCM dir (get_property ("slurVerticalDirection", 0)); - SCM dir2 (get_property ("verticalDirection", 0)); - - Direction slurdir = CENTER; - if (gh_number_p(dir)) - slurdir = to_dir (dir); - else if (gh_number_p (dir2)) - slurdir = to_dir (dir2); - for (int i = 0; i < end_slur_l_arr_.size(); i++) { - end_slur_l_arr_[i]->set_direction (slurdir); typeset_element (end_slur_l_arr_[i]); } end_slur_l_arr_.clear(); diff --git a/lily/staff-margin-engraver.cc b/lily/staff-margin-engraver.cc index a382bf84b1..13c9c7f9e6 100644 --- a/lily/staff-margin-engraver.cc +++ b/lily/staff-margin-engraver.cc @@ -18,7 +18,7 @@ Staff_margin_engraver::Staff_margin_engraver () { axis_ = X_AXIS; type_ = "margin"; - visibility_lambda_ = ly_ch_C_eval_scm ("postbreak_only_visibility"); + visibility_lambda_ = ly_ch_C_eval_scm ("postbreak-only-visibility"); } diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index c43916f4f1..dd5ddb1c8a 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -96,15 +96,8 @@ Stem_engraver::do_pre_move_processing() if (stem_p_) { - SCM prop = get_property ("verticalDirection", 0); - if (gh_number_p(prop)) - { - stem_p_->set_direction (to_dir (prop)); - stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T); - } - Translator_group* which; - prop = get_property ("stemLeftBeamCount", &which); + SCM prop = get_property ("stemLeftBeamCount", &which); if (gh_number_p(prop)) { stem_p_->beams_i_drul_[LEFT] = gh_scm2int (prop); @@ -116,6 +109,15 @@ Stem_engraver::do_pre_move_processing() stem_p_->beams_i_drul_[RIGHT] = gh_scm2int (prop); ((Translator_group*)which)->set_property ("stemRightBeamCount", SCM_UNDEFINED); } + + // UGH. Should mark non-forced instead. + SCM dir = stem_p_->get_elt_property ("direction"); + if (gh_number_p (dir) && gh_int2scm (dir)) + { + stem_p_->set_elt_property ("dir-forced", SCM_BOOL_T); + } + + typeset_element(stem_p_); stem_p_ = 0; } diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 49212b2d09..876ca6070f 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -136,18 +136,8 @@ Tie_engraver::do_pre_move_processing () } now_heads_.clear (); - SCM dir (get_property ("tieVerticalDirection", 0)); - SCM dir2 (get_property ("verticalDirection", 0)); - - Direction tie_dir = CENTER; - if (gh_number_p(dir)) - tie_dir = to_dir (dir); - else if (isdir_b (dir2)) - tie_dir = to_dir (dir2); - for (int i=0; i< tie_p_arr_.size (); i++) { - tie_p_arr_[i]->set_direction (tie_dir); typeset_element (tie_p_arr_[i]); } tie_p_arr_.clear (); diff --git a/ly/engraver.ly b/ly/engraver.ly index 60174acd44..cd6f98cf44 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -16,6 +16,26 @@ StaffContext=\translator { % Bar_engraver must be first so default bars aren't overwritten % with empty ones. \consists "Repeat_engraver"; + + + % name, glyph id, c0 position + supportedClefTypes = #'( + ("treble" "treble" -2) + ("violin" "treble" -2) + ("G" "treble" -2) + ("G2" "treble" -2) + ("french" "treble" -4 ) + ("soprano" "alto" -4 ) + ("mezzosoprano" "alto" -2 ) + ("alto" "alto" 0 ) + ("tenor" "alto" 2 ) + ("baritone" "alto" 4 ) + ("varbaritone" "bass" 0) + ("bass" "bass" 2 ) + ("F" "bass" 2) + ("subbass" "bass" 4) + ) + \consists "Clef_engraver"; \consists "Key_engraver"; \consists "Time_signature_engraver";