From e7d84e6728ecfdf74d8f214486a29c2aca199819 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 26 May 2000 01:15:04 +0200 Subject: [PATCH] patch::: 1.3.54.hwn2 * Experimental property collapse for clef and staff-symbol. --- Generated by hanwen@cs.uu.nl, From = lilypond-1.3.54.hwn1, To = lilypond-1.3.54.hwn2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.54.hwn2.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- CHANGES | 10 +++++++- VERSION | 2 +- lily/align-note-column-engraver.cc | 3 ++- lily/bar-engraver.cc | 4 ++-- lily/bar-number-engraver.cc | 2 +- lily/bar.cc | 1 - lily/clef-engraver.cc | 37 +++++++++++++++++++++--------- lily/collision.cc | 2 +- lily/grace-engraver-group.cc | 4 ++-- lily/include/paper-column.hh | 2 +- lily/include/slur-engraver.hh | 20 ---------------- lily/item.cc | 5 +--- lily/key-engraver.cc | 17 +++++++++----- lily/key-item.cc | 3 --- lily/line-of-score.cc | 4 +--- lily/mark-engraver.cc | 2 +- lily/paper-column.cc | 5 ++++ lily/score-element.cc | 14 +++++------ lily/score-engraver.cc | 6 ++--- lily/side-position-interface.cc | 12 +++++----- lily/slur-engraver.cc | 21 +++++++++++++++++ lily/slur.cc | 4 ++-- lily/span-bar-engraver.cc | 13 +++-------- lily/staff-symbol-engraver.cc | 4 ++++ lily/staff-symbol.cc | 3 ++- lily/time-signature-engraver.cc | 2 +- lily/time-signature.cc | 2 +- ly/engraver.ly | 25 ++++++++++++++++++++ ly/params.ly | 21 ++++------------- 29 files changed, 143 insertions(+), 107 deletions(-) diff --git a/CHANGES b/CHANGES index 4f557042f3..8eff3a8ced 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,12 @@ ---- ../lilypond-1.3.54/CHANGES Thu May 25 00:20:46 2000 +--- ../lilypond-1.3.54.hwn1/CHANGES Thu May 25 19:52:28 2000 +++ b/CHANGES Fri May 26 01:15:04 2000 +@@ -1,5 +1,4 @@ +-1.3.1.3.54.hwn1 +-=========== +* Experimental property collapse for clef and staff-symbol. + + * Massive search replace patch: store pointers and properties + separately, in preparation of property collapse.--- ../lilypond-1.3.54/CHANGES Thu May 25 00:20:46 2000 ++ b/CHANGES Thu May 25 23:22:02 2000 @@ -1,3 +1,11 @@ 1.3.54.jcn1 diff --git a/VERSION b/VERSION index 4e3376e8bb..620725e0e7 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=54 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=hwn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc index dff753effc..9bdd9a8240 100644 --- a/lily/align-note-column-engraver.cc +++ b/lily/align-note-column-engraver.cc @@ -47,7 +47,8 @@ Align_note_column_engraver::do_creation_processing () { align_item_p_ = new Grace_align_item; Side_position_interface (align_item_p_).set_axis (X_AXIS); - Side_position_interface (align_item_p_).set_direction (LEFT); + Side_position_interface (align_item_p_).set_direction (LEFT); + // needed for setting font size. announce_element (Score_element_info (align_item_p_, 0)); } diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 2a8c2ae66d..a70b89db35 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -29,8 +29,8 @@ Bar_engraver::create_bar () if (!bar_p_) { bar_p_ = new Staff_bar; - bar_p_->set_elt_property ("break-align-symbol", ly_symbol2scm ("Staff_bar")); - + bar_p_->property_alist_ = get_property ("basicBarlineProperties"); + // urg: "" != empty... /* TODO: use symbol. diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index a9d39a62f6..926bc0b50a 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -98,7 +98,7 @@ Bar_number_engraver::do_pre_move_processing () { if (text_p_) { - text_p_->set_elt_pointer ("side-support", staffs_); + text_p_->set_elt_pointer ("side-support-elements", staffs_); typeset_element (text_p_); text_p_ =0; } diff --git a/lily/bar.cc b/lily/bar.cc index 99f65c026e..3b5cf5fea0 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -20,7 +20,6 @@ Bar::Bar () { - set_elt_property ("breakable", SCM_BOOL_T); } diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 7fff19244c..aa7291d7c7 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -49,11 +49,17 @@ public: SCM clef_glyph_; // no need for protection. Always referenced somewhere else. Clef_engraver(); + + SCM basic_properties_; + Protected_scm current_settings_; }; Clef_engraver::Clef_engraver() { + current_settings_ = SCM_EOL; + basic_properties_ = SCM_EOL; + clef_glyph_ = SCM_EOL; clef_p_ = 0; clef_req_l_ = 0; @@ -101,6 +107,14 @@ Clef_engraver::set_type (String s) } c0_position_i_ -= (int) octave_dir_ * 7; + + + current_settings_ = gh_cons (gh_cons (ly_symbol2scm ("glyph"), clef_glyph_), basic_properties_); + current_settings_ = + gh_cons (gh_cons (ly_symbol2scm ("c0-position"), + gh_int2scm (c0_position_i_)), + current_settings_); + return true; } @@ -138,6 +152,8 @@ Clef_engraver::acknowledge_element (Score_element_info info) void Clef_engraver::do_creation_processing() { + basic_properties_ = get_property ("basicClefItemProperties"); + SCM def = get_property ("defaultClef"); if (gh_string_p (def)) { @@ -169,8 +185,7 @@ Clef_engraver::create_clef() if (!clef_p_) { Clef_item *c= new Clef_item; - c->set_elt_property ("breakable", SCM_BOOL_T); - c->set_elt_property ("break-align-symbol", ly_symbol2scm ("Clef_item")); + c-> property_alist_ = current_settings_; announce_element (Score_element_info (c, clef_req_l_)); Staff_symbol_referencer_interface si(c); @@ -217,20 +232,20 @@ Clef_engraver::do_pre_move_processing() { if (clef_p_) { - SCM vis; - if(to_boolean (clef_p_->remove_elt_property("non-default"))) + SCM vis = 0; + if(to_boolean (clef_p_->get_elt_property("non-default"))) { vis = ly_symbol2scm ("all-visible"); + vis = scm_eval (vis); } - else - vis = ly_symbol2scm ("begin-of-line-visible"); - vis = scm_eval (vis); + if (vis) + { + clef_p_->set_elt_property("visibility-lambda", vis); + if (octavate_p_) + octavate_p_->set_elt_property("visibility-lambda", vis); + } - clef_p_->set_elt_property("visibility-lambda", vis); - if (octavate_p_) - octavate_p_->set_elt_property("visibility-lambda", vis); - typeset_element (clef_p_); clef_p_ =0; diff --git a/lily/collision.cc b/lily/collision.cc index 81de09987f..b500fc8896 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -95,7 +95,7 @@ Collision::automatic_shift () for (int i=0; i < clashes.size (); i++) { SCM sh - = clashes[i]->remove_elt_property ("horizontal-shift"); + = clashes[i]->get_elt_property ("horizontal-shift"); if (gh_number_p (sh)) shift.push (gh_scm2int (sh)); diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc index 91744ff657..f7b66a62c3 100644 --- a/lily/grace-engraver-group.cc +++ b/lily/grace-engraver-group.cc @@ -6,9 +6,9 @@ (c) 1999--2000 Han-Wen Nienhuys */ + #include "grace-engraver-group.hh" #include "lily-guile.hh" - #include "score-element.hh" #include "musical-request.hh" @@ -23,7 +23,7 @@ void Grace_engraver_group::finish () { calling_self_b_ = true; - removal_processing (); // ugr. We'd want to have this done by our parents.g + removal_processing (); // ugr. We'd want to have this done by our parents. for (int i=0; i < announce_to_top_.size (); i++) { Engraver::announce_element (announce_to_top_[i]); diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh index 8bf231d3f4..5ef166a3ba 100644 --- a/lily/include/paper-column.hh +++ b/lily/include/paper-column.hh @@ -62,7 +62,7 @@ public: Moment when_mom ()const; bool musical_b () const; - + bool used_b () const; void set_rank (int); private: diff --git a/lily/include/slur-engraver.hh b/lily/include/slur-engraver.hh index f639783421..71a84a21bc 100644 --- a/lily/include/slur-engraver.hh +++ b/lily/include/slur-engraver.hh @@ -8,26 +8,6 @@ #ifndef SLURGRAV_HH #define SLURGRAV_HH -#include "engraver.hh" -class Slur_engraver :public Engraver { - Link_array requests_arr_; - Link_array new_slur_req_l_arr_; - Link_array slur_l_stack_; - Link_array end_slur_l_arr_; - - void set_melisma (bool); -protected: - virtual bool do_try_music (Music*); - virtual void do_process_music(); - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - virtual void do_removal_processing (); - -public: - VIRTUAL_COPY_CONS(Translator); - -}; #endif // SLURGRAV_HH diff --git a/lily/item.cc b/lily/item.cc index feab9823ef..61c0a28f8e 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -137,9 +137,6 @@ Item::handle_prebroken_dependencies () { if (original_l_) { - property_alist_ - = handle_broken_smobs (original_l_->property_alist_, - gh_int2scm (break_status_dir ())); pointer_alist_ = handle_broken_smobs (original_l_->pointer_alist_, gh_int2scm (break_status_dir ())); @@ -149,7 +146,7 @@ Item::handle_prebroken_dependencies () Can't do this earlier, because try_visibility_lambda () might set the elt property transparent, which would then be copied. */ - SCM vis = remove_elt_property ("visibility-lambda"); + SCM vis = get_elt_property ("visibility-lambda"); if (gh_procedure_p (vis)) { SCM args = scm_listify (gh_int2scm (break_status_dir ()), SCM_UNDEFINED); diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index e4b76f68d8..85419c2a19 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -34,13 +34,18 @@ Key_engraver::create_key (bool def) if (!item_p_) { item_p_ = new Key_item; + item_p_->property_alist_ = get_property ("basicKeyProperties"); + + + item_p_->set_elt_property ("c0-position", gh_int2scm (0)); + item_p_->set_elt_property ("old-accidentals", SCM_EOL); + item_p_->set_elt_property ("new-accidentals", SCM_EOL); + Staff_symbol_referencer_interface st (item_p_); st.set_interface (); - - item_p_->set_elt_property ("break-align-symbol", ly_symbol2scm ("Key_item")); - item_p_->set_elt_property ("multi-octave", - gh_bool2scm (key_.multi_octave_b_)); + if (key_.multi_octave_b_) + item_p_->set_elt_property ("multi-octave", gh_bool2scm (key_.multi_octave_b_)); announce_element (Score_element_info (item_p_,keyreq_l_)); @@ -68,8 +73,8 @@ Key_engraver::create_key (bool def) if (!def) - item_p_->set_elt_property ("visibility-lambda", - scm_eval (ly_symbol2scm ("all-visible"))); + item_p_->set_elt_property ("visibility-lambda", + scm_eval (ly_symbol2scm ("all-visible"))); } diff --git a/lily/key-item.cc b/lily/key-item.cc index 143d7da103..2740a77a04 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -22,9 +22,6 @@ Key_item::Key_item () { set_elt_property ("breakable", SCM_BOOL_T); set_elt_property ("c0-position", gh_int2scm (0)); - - set_elt_property ("old-accidentals", SCM_EOL); - set_elt_property ("new-accidentals", SCM_EOL); } void diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index 721240dbf2..2f340aaf4f 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -194,9 +194,7 @@ Line_of_score::column_l_arr ()const seem empty. We need to retain breakable columns, in case someone forced a breakpoint. */ - if (!bfound - || (acs[i]->get_elt_pointer ("elements") == SCM_EOL - && !brb)) + if (!bfound || !acs[i]->used_b ()) acs.del (i); } return acs; diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 0aa80fc411..7f79b1d210 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -95,7 +95,7 @@ Mark_engraver::do_pre_move_processing () { if (text_p_) { - text_p_->set_elt_property ("side-support" , staffs_); + text_p_->set_elt_pointer("side-support-elements" , staffs_); typeset_element (text_p_); text_p_ =0; } diff --git a/lily/paper-column.cc b/lily/paper-column.cc index d81fc89911..a399a6acea 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -131,3 +131,8 @@ Paper_column::musical_b () const return s != Moment(0); } +bool +Paper_column::used_b ()const +{ + return gh_pair_p (get_elt_pointer ("elements")) || breakable_b (); +} diff --git a/lily/score-element.cc b/lily/score-element.cc index 65c5e496af..ec4221cad0 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -65,7 +65,7 @@ Score_element::Score_element (Score_element const&s) self_scm_ = SCM_EOL; used_b_ = true; original_l_ =(Score_element*) &s; - property_alist_ = SCM_EOL; + property_alist_ = s.property_alist_; pointer_alist_ = SCM_EOL; status_i_ = s.status_i_; @@ -122,7 +122,9 @@ Score_element::remove_elt_property (const char* key) { SCM s = get_elt_property (key); SCM sym = ly_symbol2scm (key); - property_alist_ = scm_assq_remove_x (property_alist_, sym); + + property_alist_ = gh_cons (gh_cons (sym, SCM_UNDEFINED), property_alist_); + return s; } @@ -130,7 +132,8 @@ void Score_element::set_elt_property (String k, SCM v) { SCM s = ly_symbol2scm (k.ch_C ()); - property_alist_ = scm_assq_set_x (property_alist_, s, v); + // non destructive + property_alist_ = gh_cons (gh_cons (s, v),property_alist_); } void @@ -404,10 +407,7 @@ Score_element::handle_broken_dependencies() { Score_element * sc = s->broken_into_l_arr_[i]; Line_of_score * l = sc->line_l (); - s->broken_into_l_arr_[i]->property_alist_ = - handle_broken_smobs (property_alist_, - l ? l->self_scm_ : SCM_UNDEFINED); - s->broken_into_l_arr_[i]->pointer_alist_ = + sc->pointer_alist_ = handle_broken_smobs (pointer_alist_, l ? l->self_scm_ : SCM_UNDEFINED); } diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 76500dcf6b..21b7350a83 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -74,8 +74,6 @@ Score_engraver::do_removal_processing() typeset_all (); - if (musical_column_l_->linked_b ()) - programming_error ("Last column in score should be non-musical"); set_columns (0,0); } @@ -183,10 +181,10 @@ Score_engraver::set_columns (Paper_column *new_command_l, { if (*current[i]) { - if ((*current[i])->linked_b()) + if ((*current[i])->used_b()) + // if ((*current[i])->linked_b()) { scoreline_l_->add_column ((*current[i])); - } else { diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 28773f479f..21f8d227dc 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -25,7 +25,7 @@ Side_position_interface::Side_position_interface (Score_element const *e) void Side_position_interface::add_support (Score_element*e) { - Pointer_group_interface (elt_l_, "side-support").add_element (e); + Pointer_group_interface (elt_l_, "side-support-elements").add_element (e); } @@ -63,7 +63,7 @@ Side_position_interface::side_position (Score_element const *cme, Axis axis) { Score_element* me = (Score_element*)cme; Score_element *common = me->parent_l (axis); - SCM support = me->get_elt_pointer ("side-support"); + SCM support = me->get_elt_pointer ("side-support-elements"); for (SCM s = support; s != SCM_EOL; s = gh_cdr (s)) { Score_element * e = unsmob_element (gh_car (s)); @@ -228,8 +228,8 @@ void Side_position_interface::set_axis (Axis a) { // prop transparent ? - if (elt_l_->get_elt_property ("side-support") == SCM_UNDEFINED) - elt_l_->set_elt_property ("side-support" ,SCM_EOL); + if (elt_l_->get_elt_pointer ("side-support-elements") == SCM_UNDEFINED) + elt_l_->set_elt_pointer ("side-support-elements" ,SCM_EOL); if (!elt_l_->has_offset_callback_b (aligned_side, a)) elt_l_->add_offset_callback (aligned_side, a); @@ -274,13 +274,13 @@ Side_position_interface::set_padding (Real p) bool Side_position_interface::has_interface_b () const { - return elt_l_->get_elt_property ("side-support") != SCM_UNDEFINED; + return elt_l_->get_elt_pointer ("side-support-elements") != SCM_UNDEFINED; } bool Side_position_interface::supported_b () const { - SCM s =elt_l_->get_elt_property ("side-support"); + SCM s =elt_l_->get_elt_pointer ("side-support-elements"); return s != SCM_UNDEFINED && s != SCM_EOL; } diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index d6115db93c..5d7114482d 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -11,6 +11,27 @@ #include "debug.hh" #include "note-column.hh" #include "translator-group.hh" +#include "engraver.hh" + +class Slur_engraver :public Engraver { + Link_array requests_arr_; + Link_array new_slur_req_l_arr_; + Link_array slur_l_stack_; + Link_array end_slur_l_arr_; + + void set_melisma (bool); +protected: + virtual bool do_try_music (Music*); + virtual void do_process_music(); + virtual void acknowledge_element (Score_element_info); + virtual void do_pre_move_processing(); + virtual void do_post_move_processing(); + virtual void do_removal_processing (); + +public: + VIRTUAL_COPY_CONS(Translator); + +}; bool Slur_engraver::do_try_music (Music *req_l) diff --git a/lily/slur.cc b/lily/slur.cc index f0d82bf1b3..8439b6a35c 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -221,14 +221,14 @@ Slur::Slur () dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = 0.0; dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0; - set_elt_property ("note-columns", SCM_EOL); + set_elt_pointer ("note-columns", SCM_EOL); set_elt_property ("control-points", SCM_EOL); } void Slur::add_column (Note_column*n) { - if (!gh_pair_p (n->get_elt_property ("note-heads"))) + if (!gh_pair_p (n->get_elt_pointer ("note-heads"))) warning (_ ("Putting slur over rest. Ignoring.")); else { diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 6b9db20f74..5a3e29b968 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -43,7 +43,8 @@ Span_bar_engraver::Span_bar_engraver() Span_bar* Span_bar_engraver::get_span_bar_p() const { - return new Span_bar; + Span_bar * sp= new Span_bar; + return sp; } @@ -59,22 +60,14 @@ Span_bar_engraver::acknowledge_element (Score_element_info i) if (bar_l_arr_.size() >= 2 && !spanbar_p_) { spanbar_p_ = get_span_bar_p(); + spanbar_p_-> property_alist_ = bar_l_arr_[0]->property_alist_; spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS); spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS); - SCM v = bar_l_arr_[0]->get_elt_property ("visibility-lambda"); - if (gh_procedure_p (v)) - spanbar_p_->set_elt_property ("visibility-lambda",v); - - spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS); announce_element (Score_element_info (spanbar_p_,0)); - if (!gh_string_p (spanbar_p_->get_elt_property ("glyph"))) - spanbar_p_-> set_elt_property ("glyph", - bar_l_arr_[0]->get_elt_property ("glyph")); } } } - void Span_bar_engraver::do_pre_move_processing() { diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index 3baf35e3ef..f749d7d007 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -48,6 +48,10 @@ Staff_symbol_engraver::do_creation_processing() { span_p_ = new Staff_symbol; span_p_->set_bound(LEFT,get_staff_info().command_pcol_l ()); + + + // ugh, should do generic + span_p_->property_alist_ = get_property ("staffSymbolBasicProperties"); announce_element (Score_element_info (span_p_, 0)); } diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 4419d8dc12..d4b83618c3 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -60,5 +60,6 @@ Staff_symbol::line_count () const Real Staff_symbol::staff_space ()const { - return gh_scm2double (get_elt_property ("staff-space")); + return gh_scm2double (get_elt_property ("staff-space")) * + paper_l ()->get_var ("staffspace"); } diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 6a4a1deed7..3c42d78d96 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -36,10 +36,10 @@ Time_signature_engraver::do_process_music() if (req) { time_signature_p_ = new Time_signature; + time_signature_p_->property_alist_ = get_property ("basicTimeSignatureProperties"); time_signature_p_->set_elt_property ("fraction", gh_cons (gh_int2scm (req->beats_i_), gh_int2scm (req->one_beat_i_))); - time_signature_p_->set_elt_property ("break-align-symbol", ly_symbol2scm( "Time_signature")); } diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 4a67538f35..6a24d2bc69 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -15,7 +15,7 @@ Time_signature::Time_signature () { - set_elt_property ("breakable", SCM_BOOL_T); + } // ugh.! diff --git a/ly/engraver.ly b/ly/engraver.ly index f52fb942b4..c60ee1a510 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -23,6 +23,31 @@ StaffContext=\translator { \consists "Repeat_engraver"; + staffSymbolBasicProperties = #'( + (staff-space . 1.0 ) + (line-count . 5 ) + ) + basicTimeSignatureProperties = #`( + (break-align-symbol . Time_signature) + (visibility-lambda . ,all-visible) + (breakable . #t) + ) + basicBarlineProperties = #`( + (break-align-symbol . Staff_bar) + (visibility-lambda . `begin-of-line-invisible) + (breakable . #t) + ) + + basicKeyProperties = #`( + (break-align-symbol . Key_item) + (visibility-lambda . ,begin-of-line-visible) + (breakable . #t) + ) + basicClefItemProperties = #`( + (breakable . #t) + (break-align-symbol . Clef_item) + (visibility-lambda . ,begin-of-line-visible) + ) % name, glyph id, c0 position supportedClefTypes = #'( diff --git a/ly/params.ly b/ly/params.ly index cd799fdb76..b31166dcd7 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -1,7 +1,6 @@ % params.ly % generic paper parameters -#'staff-height = \staffheight; paperfile = \papersize + ".ly"; % paperfile = "a4.ly"; @@ -18,7 +17,6 @@ interline = \staffspace; % urg, need grace_ versions of these too? beam_thickness = 0.52 * (\staffspace - \stafflinethickness); -#'beam-thickness = \beam_thickness; %% UGR interbeam = (2.0 * \staffspace + \stafflinethickness - \beam_thickness) / 2.0; @@ -70,19 +68,10 @@ arithmetic_multiplier = 0.9 * \quartwidth ; arithmetic_basicspace = 2.0; - - -#'Stem_tremolo::beam-width = 1.5 * \quartwidth ; - -#'Left_edge_item::visibility-lambda = #begin-of-line-visible - % % UGH; junk these! % -#'Key_item::visibility-lambda = #begin-of-line-visible -#'Breathing_sign::visibility-lambda = #begin-of-line-invisible - % catch suspect beam slopes, set slope to zero if % outer stem is lengthened more than beam_lengthened = 0.2 * \staffspace; @@ -278,12 +267,12 @@ Wordwrap =0.0; #'margin-shape = #'() - - -% #'Local_key_item::left-padding = #'0.2 #'Local_key_item::right-padding = #'0.4 -#'Staff_symbol::staff-space = \staffspace ; -#'Staff_symbol::line-count = #5 +#'staff-height = \staffheight; +#'beam-thickness = \beam_thickness; %% UGR +#'Stem_tremolo::beam-width = 1.5 * \quartwidth ; +#'Breathing_sign::visibility-lambda = #begin-of-line-invisible +#'Left_edge_item::visibility-lambda = #begin-of-line-visible -- 2.39.5