From: fred Date: Tue, 26 Mar 2002 21:48:16 +0000 (+0000) Subject: lilypond-1.1.36 X-Git-Tag: release/1.5.59~2524 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=93bd8508758a2b436d73a89b70f72f216d3f799d;p=lilypond.git lilypond-1.1.36 --- diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index bf462f3e9d..a623c132e5 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -58,7 +58,10 @@ Bar_script_engraver::cast_to_interesting_item (Score_element *e) if (hang_on_clef_b_) { Clef_item * c = dynamic_cast (e); - if (c && c->default_b_) + + + // urg. + if (c) // && c->default_b_) { i = c; } diff --git a/lily/include/beam.hh b/lily/include/beam.hh index a8b6ca286a..3b99b4e083 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -15,7 +15,16 @@ /** a beam connects multiple stems. Beam adjusts the stems its owns to make sure that they reach the - beam and that point in the correct direction */ + beam and that point in the correct direction + +elt property: + +damping: amount of beam slope damping. (int) + +should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams + + +*/ class Beam : public Directional_spanner { public: /** @@ -33,10 +42,12 @@ public: /// position of leftmost end of beam Real left_y_; - /// should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams - int damping_i_; - /// should beam pos / slope be quantised? 0: no, 1: yes, 2: traditional + + /** should beam pos / slope be quantised? 0: no, 1: yes, 2: traditional + JUNKME. + */ Quantisation quantisation_; + /// maximum number of beams (for opening-up of beam-spacing) int multiple_i_; diff --git a/lily/include/stem.hh b/lily/include/stem.hh index a3f0921a45..003922789e 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -26,14 +26,22 @@ TODO. Stem size depends on flag. + + elt properties: + + beam_dir: direction of the beam (int) + + dir_force: is direction explicitely specified? (bool) + */ +// todo: remove baseclass Staff_symbol_referencer, since stem +// can be across a staff. class Stem : public Item, public Staff_symbol_referencer { - Drul_array yextent_drul_; /**extent of the stem (positions). fractional, since Beam has to adapt them. */ - + Drul_array yextent_drul_; /** geen gedonder, jij gaat onder. @@ -65,11 +73,7 @@ public: /// direction stem (that's me) Direction dir_; - /// is direction explicitely specified? - bool dir_forced_b_; - /// direction of the beam - Direction beam_dir_; Stem (); /// ensure that this Stem also encompasses the Notehead #n#