From ea22d334ff40c85fd2294ec85030911ad0ec637f Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:48:26 +0000 Subject: [PATCH] lilypond-1.1.37 --- Documentation/tex/other-packages.bib | 9 +++- flower/include/killing-cons.tcc | 44 +++++++++++++++++ lib/include/source.hh | 6 +-- lib/source.cc | 13 +++-- lily/abbreviation-beam-engraver.cc | 3 +- lily/axis-align-item.cc | 14 ++++++ lily/axis-align-spanner.cc | 13 +++++ lily/bar-engraver.cc | 12 +---- lily/bar-script-engraver.cc | 2 +- lily/dot-column.cc | 5 ++ lily/g-staff-side.cc | 11 +++-- lily/hara-kiri-line-group-engraver.cc | 5 +- lily/hara-kiri-vertical-group-spanner.cc | 11 +++-- lily/include/axis-align-spanner.hh | 25 ++++++++++ lily/include/axis-group-item.hh | 5 +- lily/include/bar-engraver.hh | 1 - lily/include/bar.hh | 4 +- lily/include/base-span-bar-engraver.hh | 4 +- lily/include/break-align-item.hh | 10 ++-- lily/include/collision.hh | 4 +- lily/include/dot-column.hh | 6 +-- lily/include/dots.hh | 1 - lily/include/g-staff-side.hh | 1 - lily/include/graphical-axis-group.hh | 6 ++- .../hara-kiri-vertical-group-spanner.hh | 6 +-- lily/include/key-engraver.hh | 6 +-- lily/include/key-item.hh | 15 +++--- lily/include/lily-proto.hh | 11 +---- lily/include/line-group-group-engraver.hh | 2 +- lily/include/note-head.hh | 12 +---- lily/include/p-col.hh | 4 +- lily/include/script-column.hh | 19 +++---- lily/include/stem-info.hh | 3 +- lily/include/stem.hh | 19 ++----- lily/include/vertical-align-engraver.hh | 4 +- lily/key-engraver.cc | 36 +++++++------- lily/key-item.cc | 37 ++++++-------- lily/line-group-group-engraver.cc | 5 +- lily/p-col.cc | 2 + lily/script-column.cc | 6 +++ lily/stem.cc | 49 +++++-------------- lily/text-engraver.cc | 2 +- lily/tie.cc | 3 +- 43 files changed, 258 insertions(+), 198 deletions(-) create mode 100644 flower/include/killing-cons.tcc create mode 100644 lily/axis-align-item.cc create mode 100644 lily/axis-align-spanner.cc create mode 100644 lily/include/axis-align-spanner.hh diff --git a/Documentation/tex/other-packages.bib b/Documentation/tex/other-packages.bib index 866659ee0d..e2c7aaafc9 100644 --- a/Documentation/tex/other-packages.bib +++ b/Documentation/tex/other-packages.bib @@ -168,7 +168,14 @@ html= {http://www.musicwareinc.com/}, note={A rewrite of MusicTeX. After licensing quarrels, MusiXTeX has been split into two (both still non-GNU GPL licensed) branches.}, } - + + + +@Misc{opus, + title = {opus}, +html={http://www.sincrosoft.com} +} + @misc{musixtex2, title = {MusiXTeX}, HTML={http://www.gmd.de/Misc/Music/}, diff --git a/flower/include/killing-cons.tcc b/flower/include/killing-cons.tcc new file mode 100644 index 0000000000..f6fcff7bd1 --- /dev/null +++ b/flower/include/killing-cons.tcc @@ -0,0 +1,44 @@ +/* + killing-cons.tcc -- declare Killing_cons + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ + +#ifndef KILLING_CONS_TCC +#define KILLING_CONS_TCC + +#include "cons.hh" + +template +Killing_cons::~Killing_cons () +{ + delete car_; +} + +template +void +copy_killing_cons_list (Cons_list &dest, Cons *src) +{ + for (; src; src = src->next_) + { + T *t = new T(*src->car_); + dest.append ( new Killing_cons (t, 0)); + } +} + +template +void +clone_killing_cons_list (Cons_list & dest, Cons *src) +{ + for (; src; src = src->next_) + { + T *t = src->car_->clone (); + dest.append (new Killing_cons (t, 0)); + } +} + +#endif /* KILLING_CONS_TCC */ + diff --git a/lib/include/source.hh b/lib/include/source.hh index 395a9d8bb4..7f4a21e7d1 100644 --- a/lib/include/source.hh +++ b/lib/include/source.hh @@ -5,9 +5,9 @@ #ifndef SOURCE_HH #define SOURCE_HH - +#include "cons.hh" #include "proto.hh" -#include "plist.hh" + class Sources { @@ -22,7 +22,7 @@ public: private: const File_path * path_C_; - Pointer_list sourcefile_p_list_; + Cons *sourcefile_p_list_; bool binary_b_ ; }; diff --git a/lib/source.cc b/lib/source.cc index ead33c63a9..66372945de 100644 --- a/lib/source.cc +++ b/lib/source.cc @@ -8,11 +8,10 @@ #include - +#include "killing-cons.tcc" #include "binary-source-file.hh" #include "string.hh" #include "proto.hh" -#include "plist.hh" #include "source-file.hh" #include "source.hh" #include "file-path.hh" @@ -62,7 +61,7 @@ Sources::get_file_l (String &file_str) //UGH void Sources::add (Source_file* sourcefile_p) { - sourcefile_p_list_.bottom ().add (sourcefile_p); + sourcefile_p_list_ = new Killing_cons (sourcefile_p, sourcefile_p_list_); } /** @@ -73,10 +72,10 @@ Sources::add (Source_file* sourcefile_p) Source_file* Sources::sourcefile_l (char const* ch_C) { - PCursor sourcefile_l_pcur (sourcefile_p_list_.top ()); - for (; sourcefile_l_pcur.ok (); sourcefile_l_pcur++) - if (sourcefile_l_pcur->in_b (ch_C)) - return *sourcefile_l_pcur; + + for (Cons *i = sourcefile_p_list_; i; i = i->next_) + if (i->car_->in_b (ch_C)) + return i->car_; return 0; } diff --git a/lily/abbreviation-beam-engraver.cc b/lily/abbreviation-beam-engraver.cc index 6f67fab90a..4b58b02be4 100644 --- a/lily/abbreviation-beam-engraver.cc +++ b/lily/abbreviation-beam-engraver.cc @@ -88,7 +88,8 @@ Abbreviation_beam_engraver::acknowledge_element (Score_element_info i) abeam_p_->multiple_i_ = s->flag_i_; if (s->type_i () != 1) // no abbrev gaps on half note - s->beam_gap_i_ = s->flag_i_ - ((s->type_i () >? 2) - 2); + s->set_elt_property (beam_gap_scm_sym, + gh_int2scm(s->flag_i_ - ((s->type_i () >? 2) - 2))); abeam_p_->add_stem (s); } diff --git a/lily/axis-align-item.cc b/lily/axis-align-item.cc new file mode 100644 index 0000000000..a8859ba588 --- /dev/null +++ b/lily/axis-align-item.cc @@ -0,0 +1,14 @@ +/* + axis-align-item.cc -- implement + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ + +#include "axis-align-item.hh" + +Axis_align_item::Axis_align_item () +{ +} diff --git a/lily/axis-align-spanner.cc b/lily/axis-align-spanner.cc new file mode 100644 index 0000000000..4aaf48e2ab --- /dev/null +++ b/lily/axis-align-spanner.cc @@ -0,0 +1,13 @@ +/* + axis-align-spanner.cc -- implement + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ +#include "axis-align-spanner.hh" + +Axis_align_spanner::Axis_align_spanner() +{ +} diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 71655de8e1..434f5bb88d 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -38,15 +38,7 @@ Bar_engraver::do_try_music (Music*r_l) } -void -Bar_engraver::acknowledge_element (Score_element_info i) -{ - if (Bar *b = dynamic_cast (i.elem_l_)) - { - // only bar-engraver should create bars - assert (0); - } -} + void Bar_engraver::create_bar () @@ -69,7 +61,7 @@ Bar_engraver::create_bar () Scalar prop = get_property ("barAtLineStart", 0); if (prop.to_bool ()) { - bar_p_->at_line_start_b_ = true; + bar_p_->set_elt_property (at_line_start_scm_sym, SCM_BOOL_T); } announce_element (Score_element_info (bar_p_, bar_req_l_)); } diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index a623c132e5..2fc8e86b17 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -138,7 +138,7 @@ Bar_script_engraver::create_items (Request *rq) Scalar padding = get_property (type_ + "ScriptPadding", 0); if (padding.length_i() && padding.isnum_b ()) { - staff_side_p_->padding_f_ = Real(padding); + staff_side_p_->set_elt_property (padding_scm_sym, gh_double2scm(Real(padding))); } diff --git a/lily/dot-column.cc b/lily/dot-column.cc index c2e1d912b0..b673b77092 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -54,3 +54,8 @@ Dot_column::do_pre_processing () } + +Dot_column::Dot_column () +{ + set_axes(X_AXIS,X_AXIS); +} diff --git a/lily/g-staff-side.cc b/lily/g-staff-side.cc index 4c3920dca1..20812e55ad 100644 --- a/lily/g-staff-side.cc +++ b/lily/g-staff-side.cc @@ -15,7 +15,7 @@ G_staff_side_item::G_staff_side_item () dir_ = CENTER; to_position_l_ = 0; set_elt_property (transparent_scm_sym, SCM_BOOL_T); - padding_f_ = 0; + axis_ = Y_AXIS; } @@ -86,8 +86,13 @@ G_staff_side_item::position_self () common = dim_cache_[axis_].parent_l_; } Interval sym_dim = to_position_l_->extent (axis_); - Real off = dim_cache_[axis_].relative_coordinate (common) - padding_f_ * dir_; - + Real off = dim_cache_[axis_].relative_coordinate (common); + + SCM pad = remove_elt_property (padding_scm_sym); + if (pad != SCM_BOOL_F) + { + off -= gh_scm2double (SCM_CDR(pad)) * dir_; + } dim_cache_[axis_].set_offset (dim[dir_] - sym_dim[-dir_] - off); } diff --git a/lily/hara-kiri-line-group-engraver.cc b/lily/hara-kiri-line-group-engraver.cc index 5fc4ede7b3..2d9fe8a916 100644 --- a/lily/hara-kiri-line-group-engraver.cc +++ b/lily/hara-kiri-line-group-engraver.cc @@ -16,7 +16,8 @@ ADD_THIS_TRANSLATOR (Hara_kiri_line_group_engraver); void Hara_kiri_line_group_engraver::create_line_spanner () { - staffline_p_ = new Hara_kiri_vertical_group_spanner; + staffline_p_ = new Hara_kiri_group_spanner; + } void @@ -24,7 +25,7 @@ Hara_kiri_line_group_engraver::typeset_element(Score_element * e) { if (Rhythmic_head *h = dynamic_cast (e)) { - dynamic_cast (staffline_p_) + dynamic_cast (staffline_p_) ->add_interesting_item (h); } Line_group_engraver_group::typeset_element (e); diff --git a/lily/hara-kiri-vertical-group-spanner.cc b/lily/hara-kiri-vertical-group-spanner.cc index 84872173a4..5b80d2cddb 100644 --- a/lily/hara-kiri-vertical-group-spanner.cc +++ b/lily/hara-kiri-vertical-group-spanner.cc @@ -12,19 +12,20 @@ #include "debug.hh" #include "item.hh" -Hara_kiri_vertical_group_spanner::Hara_kiri_vertical_group_spanner() +Hara_kiri_group_spanner::Hara_kiri_group_spanner() { + set_axes(Y_AXIS,Y_AXIS); } void -Hara_kiri_vertical_group_spanner::add_interesting_item (Item* n) +Hara_kiri_group_spanner::add_interesting_item (Item* n) { add_dependency (n); interesting_items_.push (n); } void -Hara_kiri_vertical_group_spanner::do_post_processing () +Hara_kiri_group_spanner::do_post_processing () { if (!interesting_items_.empty ()) return; @@ -39,7 +40,7 @@ Hara_kiri_vertical_group_spanner::do_post_processing () } void -Hara_kiri_vertical_group_spanner::do_substitute_element_pointer (Score_element*o, Score_element*n) +Hara_kiri_group_spanner::do_substitute_element_pointer (Score_element*o, Score_element*n) { if (Item *it = dynamic_cast (o)) interesting_items_.substitute (it, dynamic_cast (n)); @@ -47,7 +48,7 @@ Hara_kiri_vertical_group_spanner::do_substitute_element_pointer (Score_element*o void -Hara_kiri_vertical_group_spanner::do_print () const +Hara_kiri_group_spanner::do_print () const { Axis_group_spanner::do_print (); } diff --git a/lily/include/axis-align-spanner.hh b/lily/include/axis-align-spanner.hh new file mode 100644 index 0000000000..04ebf26d35 --- /dev/null +++ b/lily/include/axis-align-spanner.hh @@ -0,0 +1,25 @@ +/* + vertical-align-spanner.hh -- declare Vertical_align_spanner + + source file of the GNU LilyPond music typesetter + + (c) 1997--1999 Han-Wen Nienhuys +*/ + + +#ifndef VERTICAL_ALIGN_SPANNER_HH +#define VERTICAL_ALIGN_SPANNER_HH + +#include "spanner.hh" +#include "align-element.hh" +#include "axis-group-spanner.hh" + +class Axis_align_spanner : public virtual Align_element, + public virtual Axis_group_spanner +{ +public: + VIRTUAL_COPY_CONS(Score_element); + Axis_align_spanner (); + virtual void do_print() const {} +}; +#endif // VERTICAL_ALIGN_SPANNER_HH diff --git a/lily/include/axis-group-item.hh b/lily/include/axis-group-item.hh index 9d0852b64a..b3701a1534 100644 --- a/lily/include/axis-group-item.hh +++ b/lily/include/axis-group-item.hh @@ -17,11 +17,14 @@ A grouping item. Its special support is in do_breakable_col_processing(). */ -class Axis_group_item : public virtual Axis_group_element, public Item { +class Axis_group_item : public virtual Axis_group_element, + public virtual Item { protected: virtual void do_breakable_col_processing(); void OK() const; virtual void do_print() const; +public: + VIRTUAL_COPY_CONS(Score_element); }; #endif // AXIS_ITEM_HH diff --git a/lily/include/bar-engraver.hh b/lily/include/bar-engraver.hh index 647a47e05d..bbb26c7c70 100644 --- a/lily/include/bar-engraver.hh +++ b/lily/include/bar-engraver.hh @@ -24,7 +24,6 @@ public: void request_bar (String type_str); protected: - virtual void acknowledge_element (Score_element_info i); virtual void do_creation_processing (); virtual void do_removal_processing (); virtual bool do_try_music (Music *req_l); diff --git a/lily/include/bar.hh b/lily/include/bar.hh index 08e48d2f6e..3c43bc0dcd 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -14,9 +14,6 @@ class Bar:public Item { public: String type_str_; - bool at_line_start_b_; - - VIRTUAL_COPY_CONS(Score_element); Bar (); @@ -24,6 +21,7 @@ protected: virtual void do_pre_processing (); virtual Molecule* do_brew_molecule_p () const; virtual Real get_bar_size () const; + private: void do_print () const; }; diff --git a/lily/include/base-span-bar-engraver.hh b/lily/include/base-span-bar-engraver.hh index cf992c8fb9..47c274d758 100644 --- a/lily/include/base-span-bar-engraver.hh +++ b/lily/include/base-span-bar-engraver.hh @@ -11,7 +11,7 @@ #define SPAN_BAR_GRAV_HH #include "engraver.hh" - +class Axis_align_spanner; /** Make bars that span multiple "staffs". Catch bars, and span a @@ -22,7 +22,7 @@ class Base_span_bar_engraver : public Engraver { Span_bar * spanbar_p_; Array bar_l_arr_; - Vertical_align_spanner * valign_l_; + Axis_align_spanner * valign_l_; public: VIRTUAL_COPY_CONS(Translator); diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh index d127e7879b..d2b98fa7ce 100644 --- a/lily/include/break-align-item.hh +++ b/lily/include/break-align-item.hh @@ -10,16 +10,16 @@ #ifndef BREAK_ALIGN_ITEM_HH #define BREAK_ALIGN_ITEM_HH -#include "horizontal-align-item.hh" +#include "axis-align-item.hh" /// align breakable items (clef, bar, etc.) -class Break_align_item : public Horizontal_align_item { +class Break_align_item : public Axis_align_item { protected: - virtual void do_pre_processing(); + virtual void do_pre_processing(); public: - - VIRTUAL_COPY_CONS(Score_element); + Break_align_item (); + VIRTUAL_COPY_CONS(Score_element); }; #endif // BREAK_ALIGN_ITEM_HH diff --git a/lily/include/collision.hh b/lily/include/collision.hh index 832ac89704..42b14277cf 100644 --- a/lily/include/collision.hh +++ b/lily/include/collision.hh @@ -10,7 +10,7 @@ #ifndef COLLISION_HH #define COLLISION_HH #include "lily-proto.hh" -#include "horizontal-vertical-group-item.hh" +#include "axis-group-item.hh" /** Resolve conflicts between various Note_columns (chords). @@ -20,7 +20,7 @@ multistaff support (see Chlapik: equal noteheads should be on the same hpos.) */ -class Collision : public Horizontal_vertical_group_item { +class Collision : public Axis_group_item { protected: virtual void do_substitute_element_pointer (Score_element*,Score_element*); virtual void do_pre_processing(); diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 67a62429c2..374181e014 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -10,12 +10,12 @@ #ifndef DOT_COLUMN_HH #define DOT_COLUMN_HH -#include "horizontal-group-item.hh" +#include "axis-group-item.hh" /** Group dots. This is needed because, the dots have to be aligned per voice */ -class Dot_column : public Horizontal_group_item +class Dot_column : public Axis_group_item { Link_array head_l_arr_; Link_array dot_l_arr_; @@ -24,7 +24,7 @@ public: void add_head (Rhythmic_head*); void add_dots (Dots*); - + Dot_column (); protected: virtual void do_pre_processing (); virtual void do_substitute_element_pointer (Score_element *o, Score_element*n); diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 2ff6f06170..919da6fb8d 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -24,7 +24,6 @@ protected: public: int no_dots_i_; int position_i_; - Dots (); }; diff --git a/lily/include/g-staff-side.hh b/lily/include/g-staff-side.hh index 6334233f11..c463360e27 100644 --- a/lily/include/g-staff-side.hh +++ b/lily/include/g-staff-side.hh @@ -20,7 +20,6 @@ public: Score_element * to_position_l_; Direction dir_; Link_array support_l_arr_; - Real padding_f_; Axis axis_; G_staff_side_item (); diff --git a/lily/include/graphical-axis-group.hh b/lily/include/graphical-axis-group.hh index 73249862b6..c21995c39c 100644 --- a/lily/include/graphical-axis-group.hh +++ b/lily/include/graphical-axis-group.hh @@ -22,19 +22,21 @@ */ class Graphical_axis_group : public virtual Graphical_element { public: + // keep array in order. + bool ordered_b_; Link_array elem_l_arr_; Axis axes_[2]; Interval extent (Axis) const; virtual void do_print() const; Graphical_axis_group (Graphical_axis_group const&); - Graphical_axis_group (Axis,Axis); + Graphical_axis_group (); + virtual void set_axes (Axis,Axis); void remove_all (); bool contains_b (Graphical_element const *) const; void add_element (Graphical_element*); void remove_element (Graphical_element*); - }; #endif // Graphical_axis_group_HH diff --git a/lily/include/hara-kiri-vertical-group-spanner.hh b/lily/include/hara-kiri-vertical-group-spanner.hh index 3f5031ba48..7479e90b29 100644 --- a/lily/include/hara-kiri-vertical-group-spanner.hh +++ b/lily/include/hara-kiri-vertical-group-spanner.hh @@ -10,17 +10,17 @@ #ifndef HARA_KIRI_VERTICAL_GROUP_SPANNER_HH #define HARA_KIRI_VERTICAL_GROUP_SPANNER_HH -#include "vertical-group-spanner.hh" +#include "axis-group-spanner.hh" /** As Vertical_group_spanner, but keep track of interesting items. If we don't contain any interesting items after linebreaking, then gracefully commit suicide. Objective: don't disgrace Lily by typesetting empty lines in orchestral scores. */ -class Hara_kiri_vertical_group_spanner : public Vertical_group_spanner +class Hara_kiri_group_spanner : public Axis_group_spanner { public: - Hara_kiri_vertical_group_spanner (); + Hara_kiri_group_spanner (); virtual void do_post_processing (); void add_interesting_item (Item* n); protected: diff --git a/lily/include/key-engraver.hh b/lily/include/key-engraver.hh index e93907886c..aef3f27faf 100644 --- a/lily/include/key-engraver.hh +++ b/lily/include/key-engraver.hh @@ -27,11 +27,11 @@ public: VIRTUAL_COPY_CONS(Translator); Key key_; Key_change_req * keyreq_l_; - Key_item * kit_p_; + Key_item * item_p_; Array accidental_idx_arr_; Array old_accidental_idx_arr_; - bool default_key_b_; - bool change_key_b_; + + protected: virtual bool do_try_music (Music *req_l); diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index 0833aca961..82f72cb871 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -13,19 +13,17 @@ /// An item which places accidentals at the start of the line class Key_item :public Item, public Staff_symbol_referencer { -public: - Array pitch_arr_; Array acc_arr_; Array old_pitch_arr_; Array old_acc_arr_; + int c0_position_; + + +public: + bool multi_octave_b_; - // ugh. Naming - int c_position; - // see above. - int c0_position; - bool default_b_; - bool multi_octave_b_; + int get_c_position () const; VIRTUAL_COPY_CONS(Score_element); @@ -37,7 +35,6 @@ public: int calculate_position(int p, int a) const; protected: - virtual void do_pre_processing(); virtual Molecule* do_brew_molecule_p() const; }; diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index 545ba25af6..367ff2febd 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -89,13 +89,9 @@ struct Graphical_element; struct Graphical_axis_group; struct Global_translator; struct Hara_kiri_line_group_engraver; -struct Hara_kiri_vertical_group_spanner; +struct Hara_kiri_group_spanner; struct Head_column; -struct Horizontal_align_item; -struct Horizontal_group_element; -struct Horizontal_group_item; -struct Horizontal_vertical_group; struct Idealspacing; struct Identifier; struct Input_file; @@ -257,10 +253,7 @@ struct Translator_group; struct Timing_req; struct Vertical_brace; struct Vertical_spanner; -struct Vertical_group_element; -struct Vertical_group_spanner; -struct Vertical_align_spanner; -struct Vertical_align_engraver; + struct Volta_spanner; struct Align_element; struct Sequential_music; diff --git a/lily/include/line-group-group-engraver.hh b/lily/include/line-group-group-engraver.hh index 24d1dd668c..93e917310b 100644 --- a/lily/include/line-group-group-engraver.hh +++ b/lily/include/line-group-group-engraver.hh @@ -18,7 +18,7 @@ */ class Line_group_engraver_group : public Engraver_group_engraver { protected: - Vertical_group_spanner *staffline_p_; + Axis_group_spanner *staffline_p_; virtual void create_line_spanner (); virtual void do_creation_processing(); diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index a48792349d..e931ede0ea 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -17,20 +17,10 @@ class Note_head : public Rhythmic_head { public: - - String note_head_type_str_; - - /// position of top line (5 linestaff: 8) int position_i_; - /// -1 = lowest, 0 = inside, 1 = top - int extremal_i_; - - /// needed for the help-lines - int staff_size_i_; - Direction x_dir_; - Note_head (); + void flip_around_stem (Direction); static int compare (Note_head * const &a, Note_head *const &b) ; protected: virtual Interval do_width () const; diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh index 3f3f35e517..fd379a3347 100644 --- a/lily/include/p-col.hh +++ b/lily/include/p-col.hh @@ -10,7 +10,7 @@ #ifndef P_COL_HH #define P_COL_HH -#include "horizontal-group-item.hh" +#include "axis-group-item.hh" #include "rod.hh" @@ -27,7 +27,7 @@ \end{itemize} */ -class Paper_column : public Horizontal_group_item { +class Paper_column : public Axis_group_item { public: VIRTUAL_COPY_CONS(Score_element); Drul_array > minimal_dists_arr_drul_; diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 94d1e481e1..74ba090bad 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -10,23 +10,24 @@ #ifndef SCRIPT_COLUMN_HH #define SCRIPT_COLUMN_HH -#include "horizontal-vertical-group-item.hh" +#include "axis-group-item.hh" /** a struct for treating a group of noteheads (noteheads, stem (chord) and scripts) as a single entity. */ -class Script_column : public Horizontal_vertical_group_item { +class Script_column : public Axis_group_item { protected: - virtual void do_print() const; - virtual void do_substitute_element_pointer (Score_element*, Score_element*); - virtual void do_pre_processing() ; + virtual void do_print() const; + virtual void do_substitute_element_pointer (Score_element*, Score_element*); + virtual void do_pre_processing() ; public: - Link_array