From: fred Date: Wed, 27 Mar 2002 00:01:26 +0000 (+0000) Subject: lilypond-1.3.68 X-Git-Tag: release/1.5.59~1207 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5ce0f096a4e59bba1877d79cebf8d4af5b41a360;p=lilypond.git lilypond-1.3.68 --- diff --git a/lily/include/chord-name-engraver.hh b/lily/include/chord-name-engraver.hh deleted file mode 100644 index e8b780d383..0000000000 --- a/lily/include/chord-name-engraver.hh +++ /dev/null @@ -1,37 +0,0 @@ -/* - chord-name-engraver.hh -- declare Chord_name_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Jan Nieuwenhuizen -*/ - -#ifndef CHORD_NAME_ENGRAVER_HH -#define CHORD_NAME_ENGRAVER_HH - -#include "engraver.hh" -#include "array.hh" -#include "musical-pitch.hh" -#include "lily-proto.hh" - -class Chord_name_engraver : public Engraver -{ -public: - Chord_name_engraver (); - VIRTUAL_COPY_CONS (Translator); - -protected: - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info i); - virtual void do_process_music (); - virtual bool do_try_music (Music* m); - -private: - Array pitch_arr_; - Chord_name* chord_name_p_; - Tonic_req* tonic_req_; - Inversion_req* inversion_req_; - Bass_req* bass_req_; -}; - -#endif // CHORD_NAME_ENGRAVER_HH diff --git a/lily/include/dot-column-engraver.hh b/lily/include/dot-column-engraver.hh deleted file mode 100644 index deec318345..0000000000 --- a/lily/include/dot-column-engraver.hh +++ /dev/null @@ -1,28 +0,0 @@ -/* - dot-column-engraver.hh -- declare Dot_column_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys -*/ - - -#ifndef DOT_COLUMN_GRAV_HH -#define DOT_COLUMN_GRAV_HH - -#include "engraver.hh" - -class Dot_column_engraver : public Engraver -{ - Dot_column *dotcol_p_ ; - Link_array head_l_arr_; -public: - VIRTUAL_COPY_CONS(Translator); - Dot_column_engraver(); - -protected: - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing (); -}; - -#endif // DOT_COLUMN_GRAV_HH diff --git a/lily/include/repeat-engraver.hh b/lily/include/repeat-engraver.hh deleted file mode 100644 index bd8bbd9237..0000000000 --- a/lily/include/repeat-engraver.hh +++ /dev/null @@ -1,62 +0,0 @@ -/* - repeat-engraver.hh -- declare Repeat_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Jan Nieuwenhuizen -*/ - -#ifndef REPEAT_ENGRAVER_HH -#define REPEAT_ENGRAVER_HH - -#include "engraver.hh" -#include "cons.hh" - -struct Bar_create_event -{ - Moment when_; - bool bar_b_; - bool last_b_; - String type_; - Bar_create_event(); - Bar_create_event (Moment w, String s); - Bar_create_event (Moment w, int i, int j); -}; - -int compare (Bar_create_event const & c1, Bar_create_event const &c2) -{ - return (c1.when_ - c2.when_).sign(); -} - -/** - Generate repeat-bars |: :| for repeated-music - */ -class Repeat_engraver : public Engraver -{ -public: - VIRTUAL_COPY_CONS(Translator); - Repeat_engraver (); -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_music(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing (); - void queue_events (); - -private: - Repeated_music *repeated_music_l_; - bool done_this_one_b_; - - /* - Royal_brackla_create_queue is only two Whiskies away. :-) - */ - Cons *create_barmoments_queue_; - - Volta_spanner * volta_span_p_; - Volta_spanner* end_volta_span_p_; -}; - -#endif // REPEAT_ENGRAVER_HH - diff --git a/lily/include/score-priority-engraver.hh b/lily/include/score-priority-engraver.hh deleted file mode 100644 index 3ec4360f91..0000000000 --- a/lily/include/score-priority-engraver.hh +++ /dev/null @@ -1,39 +0,0 @@ -/* - score-align-engraver.hh -- declare Type_align_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys -*/ - - -#ifndef SCOREF_ALIGN_GRAV_HH -#define SCOREF_ALIGN_GRAV_HH - -#include "engraver.hh" - -/** - Group a number of items across staffs: - - Acknowledge items, put each priority in a separate column. Put all - columns in a horizontal align engraver. We manufacture two types of - elements: the alignment element and the columns. This is probably - more convenient, and I question the use having one without the - other. -*/ -class Score_priority_engraver : public Engraver -{ - Break_align_item * halign_p_; - Link_array column_p_arr_; - - void add_horizontal_group (Item* , int p); -public: - VIRTUAL_COPY_CONS(Translator); - Score_priority_engraver (); - -protected: - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing(); -}; - -#endif // SCORE_ALIGN_GRAV_HH diff --git a/lily/include/single-malt-grouping-item.hh b/lily/include/single-malt-grouping-item.hh deleted file mode 100644 index 082a37b517..0000000000 --- a/lily/include/single-malt-grouping-item.hh +++ /dev/null @@ -1,40 +0,0 @@ -/* - single-malt-grouping-item.hh -- declare Single_malt_grouping_item - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys - - */ - -#ifndef SINGLE_MALT_GROUPING_ITEM_HH -#define SINGLE_MALT_GROUPING_ITEM_HH - -#include "item.hh" - -/** Calc dimensions for the Separating_group_spanner; this has to be - an item to get dependencies correct. It can't be an element_group - since these usually are in a different X_group - - It's 1:30 am. Naming suggestions appreciated. - - Properties: - - - elements -- list of items. - - no-spacing-rods -- read from elements: boolean that makes Single_malt_grouping_item ignore - this item - -*/ -class Single_malt_grouping_item : public Item -{ - VIRTUAL_COPY_CONS(Score_element); -public: - Single_malt_grouping_item (SCM); - Interval my_width () const; - void add_item (Item*); -}; - -#endif /* SINGLE_MALT_GROUPING_ITEM_HH */ - diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh deleted file mode 100644 index 8b13789179..0000000000 --- a/lily/include/text-item.hh +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lily/include/time-signature-engraver.hh b/lily/include/time-signature-engraver.hh deleted file mode 100644 index 11959f816f..0000000000 --- a/lily/include/time-signature-engraver.hh +++ /dev/null @@ -1,28 +0,0 @@ -/* - time_signature-engraver.hh -- declare Time_signature_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys -*/ - - -#ifndef TIME_SIG_ENGRAVER_HH -#define TIME_SIG_ENGRAVER_HH - -#include "engraver.hh" - -/** - generate time_signatures. - */ -class Time_signature_engraver : public Engraver { -protected: - virtual void do_process_music(); - virtual void do_pre_move_processing(); -public: - VIRTUAL_COPY_CONS(Translator); - Time_signature * time_signature_p_; - - Time_signature_engraver(); -}; -#endif // TIME_SIG_ENGRAVER_HH diff --git a/lily/single-malt-grouping-item.cc b/lily/single-malt-grouping-item.cc deleted file mode 100644 index 84d10f7230..0000000000 --- a/lily/single-malt-grouping-item.cc +++ /dev/null @@ -1,73 +0,0 @@ -/* - single-malt-grouping-item.cc -- implement Single_malt_grouping_item - - source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ - -#include "single-malt-grouping-item.hh" -#include "paper-column.hh" -#include "debug.hh" -#include "group-interface.hh" - -Single_malt_grouping_item ::Single_malt_grouping_item(SCM s) - : Item (s) -{ - set_elt_pointer ("elements", SCM_EOL); - - // this is weird! , but needed! - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); - -} - -void -Single_malt_grouping_item::add_item (Item* i) -{ - assert (i); - Pointer_group_interface (this).add_element (i); - - add_dependency (i); -} - -Interval -Single_malt_grouping_item::my_width () const -{ - Paper_column * pc = column_l (); - Interval w; - - for (SCM s = get_elt_pointer ("elements"); gh_pair_p (s); s = gh_cdr (s)) - { - SCM elt = gh_car (s); - if (!SMOB_IS_TYPE_B(Score_element, elt)) - continue; - - Item *il = dynamic_cast (SMOB_TO_TYPE (Score_element, elt)); - if (pc != il->column_l ()) - { - /* this shouldn't happen, but let's continue anyway. */ - programming_error (_("Single_malt_grouping_item: I've been drinking too much")); - continue; /*UGH UGH*/ - } - - if (to_boolean (il->get_elt_property ("no-spacing-rods"))) - { - continue; - } - - Interval iv (il->extent (X_AXIS)); - if (!iv.empty_b ()) - { - Real off = il->relative_coordinate (pc, X_AXIS); - w.unite (iv + off); - } - } - - return w; - // add this->offset_ ? this-> relative_coordinate ()? -} - - -