From 9f51fe60f6fcbd00e50a599a2f46c7319ae5c396 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:07:51 +0000 Subject: [PATCH] lilypond-1.1.37 --- lib/template.cc | 21 ---- lily/horizontal-align-item.cc | 35 ------ lily/horizontal-group-element.cc | 19 --- lily/horizontal-group-item.cc | 23 ---- lily/horizontal-vertical-group-element.cc | 15 --- lily/horizontal-vertical-group-item.cc | 25 ---- lily/include/cons.cc | 10 -- lily/include/cons.hh | 111 ------------------ lily/include/horizontal-align-item.hh | 30 ----- lily/include/horizontal-group-element.hh | 30 ----- lily/include/horizontal-group-item.hh | 28 ----- .../horizontal-vertical-group-element.hh | 33 ------ .../include/horizontal-vertical-group-item.hh | 30 ----- lily/include/killing-cons.tcc | 44 ------- lily/include/span-score-bar.hh | 29 ----- lily/include/vertical-align-spanner.hh | 25 ---- lily/include/vertical-group-element.hh | 27 ----- lily/include/vertical-group-spanner.hh | 28 ----- lily/vertical-align-spanner.cc | 23 ---- lily/vertical-group-elem.cc | 26 ---- lily/vertical-group-spanner.cc | 16 --- 21 files changed, 628 deletions(-) delete mode 100644 lib/template.cc delete mode 100644 lily/horizontal-align-item.cc delete mode 100644 lily/horizontal-group-element.cc delete mode 100644 lily/horizontal-group-item.cc delete mode 100644 lily/horizontal-vertical-group-element.cc delete mode 100644 lily/horizontal-vertical-group-item.cc delete mode 100644 lily/include/cons.cc delete mode 100644 lily/include/cons.hh delete mode 100644 lily/include/horizontal-align-item.hh delete mode 100644 lily/include/horizontal-group-element.hh delete mode 100644 lily/include/horizontal-group-item.hh delete mode 100644 lily/include/horizontal-vertical-group-element.hh delete mode 100644 lily/include/horizontal-vertical-group-item.hh delete mode 100644 lily/include/killing-cons.tcc delete mode 100644 lily/include/span-score-bar.hh delete mode 100644 lily/include/vertical-align-spanner.hh delete mode 100644 lily/include/vertical-group-element.hh delete mode 100644 lily/include/vertical-group-spanner.hh delete mode 100644 lily/vertical-align-spanner.cc delete mode 100644 lily/vertical-group-elem.cc delete mode 100644 lily/vertical-group-spanner.cc diff --git a/lib/template.cc b/lib/template.cc deleted file mode 100644 index 3f6b91c9d0..0000000000 --- a/lib/template.cc +++ /dev/null @@ -1,21 +0,0 @@ -/* - template.cc -- instantiate Pointer_list - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - -#include "config.hh" -#include "source-file.hh" -#include "plist.tcc" -#include "pcursor.tcc" -#include "cursor.tcc" -#include "list.tcc" - -#ifdef NEED_EXPLICIT_INSTANTIATION -LIST_INSTANTIATE (void *); -#endif - -POINTERLIST_INSTANTIATE (Source_file); - diff --git a/lily/horizontal-align-item.cc b/lily/horizontal-align-item.cc deleted file mode 100644 index 8a15780d62..0000000000 --- a/lily/horizontal-align-item.cc +++ /dev/null @@ -1,35 +0,0 @@ -/* - horizontal-align-item.cc -- implement Horizontal_align_item - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - -#include "horizontal-align-item.hh" -#include "debug.hh" - - - -void -Horizontal_align_item::add_item (Item *i,int p) -{ - add_element_priority (i,p); -} - -void -Horizontal_align_item::do_print() const -{ -#ifndef NPRINT - Item::do_print (); - Align_element::do_print (); -#endif -} - - -Horizontal_align_item::Horizontal_align_item () -{ - align_dir_ = CENTER; - stacking_dir_ = RIGHT; - axis_ = X_AXIS; -} diff --git a/lily/horizontal-group-element.cc b/lily/horizontal-group-element.cc deleted file mode 100644 index 6801861409..0000000000 --- a/lily/horizontal-group-element.cc +++ /dev/null @@ -1,19 +0,0 @@ -#include "horizontal-group-element.hh" -#include "interval.hh" -#include "item.hh" -#include "debug.hh" - - - - -Horizontal_group_element::Horizontal_group_element () - : Axis_group_element (X_AXIS,X_AXIS) -{ -} - -Interval -Horizontal_group_element::do_width() const -{ - return Graphical_axis_group::extent (X_AXIS); -} - diff --git a/lily/horizontal-group-item.cc b/lily/horizontal-group-item.cc deleted file mode 100644 index 3919d28a41..0000000000 --- a/lily/horizontal-group-item.cc +++ /dev/null @@ -1,23 +0,0 @@ -/* - horizontal-group-item.cc -- implement Horizontal_group_item - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - -#include "p-col.hh" -#include "horizontal-group-item.hh" - - - -void -Horizontal_group_item::do_print() const -{ - Axis_group_item::do_print(); -} - -Horizontal_group_item::Horizontal_group_item () -{ - axes_[0] = axes_[1] = X_AXIS; -} diff --git a/lily/horizontal-vertical-group-element.cc b/lily/horizontal-vertical-group-element.cc deleted file mode 100644 index b8b09b7bda..0000000000 --- a/lily/horizontal-vertical-group-element.cc +++ /dev/null @@ -1,15 +0,0 @@ - -#include "horizontal-vertical-group-element.hh" -#include "interval.hh" -#include "item.hh" -#include "debug.hh" - -Horizontal_vertical_group_element::Horizontal_vertical_group_element() -{ - axes_[0] = X_AXIS; - axes_[1] = Y_AXIS; -} - - - - diff --git a/lily/horizontal-vertical-group-item.cc b/lily/horizontal-vertical-group-item.cc deleted file mode 100644 index abb1c6febf..0000000000 --- a/lily/horizontal-vertical-group-item.cc +++ /dev/null @@ -1,25 +0,0 @@ -/* - horizontal-vertical-group-item.cc -- implement Horizontal_vertical_group_item - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - - -#include "horizontal-vertical-group-item.hh" -#include "p-col.hh" - -void -Horizontal_vertical_group_item::do_print() const -{ - Horizontal_vertical_group_element::do_print(); -} - - - -Horizontal_vertical_group_item::Horizontal_vertical_group_item () -{ - axes_[0] = X_AXIS; - axes_[1] = Y_AXIS; -} diff --git a/lily/include/cons.cc b/lily/include/cons.cc deleted file mode 100644 index 39ed3095f6..0000000000 --- a/lily/include/cons.cc +++ /dev/null @@ -1,10 +0,0 @@ -/* - cons.cc -- implement - - source file of the GNU LilyPond music typesetter - - (c) 1999 Han-Wen Nienhuys - - */ - -#include "cons.hh" diff --git a/lily/include/cons.hh b/lily/include/cons.hh deleted file mode 100644 index 7e2a995450..0000000000 --- a/lily/include/cons.hh +++ /dev/null @@ -1,111 +0,0 @@ -/* - cons.hh -- declare LISP like datatypes - - source file of the GNU LilyPond music typesetter - - (c) 1999 Han-Wen Nienhuys - - */ - -#ifndef CONS_HH -#define CONS_HH - - -template -class Cons -{ -public: - T * car_; - Cons * next_; - Cons () - { - car_=0; - next_ =0; - } - Cons (T*t, Cons*c) - { - car_ = t; - next_ = c; - } - virtual ~Cons () - { - delete next_; - } -}; - -template -class Killing_cons : public Cons -{ -public: - Killing_cons (T *t, Cons *p) - : Cons( t,p) - { - } - virtual ~Killing_cons (); -}; - - -/// remove the link pointed to by *p. -template -Cons *remove_cons (Cons **pp) -{ - Cons *knip = *pp; - *pp = (*pp)->next_; - knip->next_ = 0; - return knip; -} - - -template -class Cons_list -{ -public: - Cons * head_; - Cons ** tail_; - Cons_list () { init_list (); } - void init_list () {head_ =0; tail_ = &head_; } - void append (Cons *c) - { - assert (!c->next_); - *tail_ = c; - while (*tail_) - tail_ = &(*tail_)->next_; - } - Cons *remove_cons (Cons **pp) - { - if (&(*pp)->next_ == tail_) - tail_ = pp; - - return ::remove_cons (pp); - } - void junk () - { - delete head_; - head_ =0; - } - ~Cons_list () { junk (); } -}; - - -template -void copy_killing_cons_list (Cons_list&, Cons *src); -template -void -clone_killing_cons_list (Cons_list&, Cons *src); - -template int cons_list_size_i (Cons *l) -{ - int i=0; - while (l) - { - l = l->next_; - i++; - } - return i; -} - - - - -#endif /* CONS_HH */ - diff --git a/lily/include/horizontal-align-item.hh b/lily/include/horizontal-align-item.hh deleted file mode 100644 index ae2ff01640..0000000000 --- a/lily/include/horizontal-align-item.hh +++ /dev/null @@ -1,30 +0,0 @@ -/* - horizontal-align-item.hh -- declare Horizontal_align_item - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - - -#ifndef HORIZONTAL_ALIGN_ITEM_HH -#define HORIZONTAL_ALIGN_ITEM_HH - -#include "item.hh" -#include "align-element.hh" - -/** - Order elems left to right. - - TODO: insert (order, elem) - */ -class Horizontal_align_item : public Item , public Align_element { -public: - - VIRTUAL_COPY_CONS(Score_element); - void add_item (Item*, int p); - Horizontal_align_item(); - virtual void do_print() const; - -}; -#endif // HORIZONTAL_ALIGN_ITEM_HH diff --git a/lily/include/horizontal-group-element.hh b/lily/include/horizontal-group-element.hh deleted file mode 100644 index ed2e393565..0000000000 --- a/lily/include/horizontal-group-element.hh +++ /dev/null @@ -1,30 +0,0 @@ -/* - horizontal-group-element.hh -- declare Horizontal_group_element - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys - - */ - -#ifndef HORIZONTAL_GROUP_ELEM_HH -#define HORIZONTAL_GROUP_ELEM_HH - -#include "axis-group-element.hh" - -/** - Treat a group of elements a unity in horizontal sense . - A column is a typical Vertical_group. - */ -class Horizontal_group_element : public virtual Axis_group_element { -protected: - virtual Interval do_width() const; - -public: - Horizontal_group_element (); - -}; - - -#endif /* HORIZONTAL_GROUP_ELEM_HH */ - diff --git a/lily/include/horizontal-group-item.hh b/lily/include/horizontal-group-item.hh deleted file mode 100644 index 0c96d29c95..0000000000 --- a/lily/include/horizontal-group-item.hh +++ /dev/null @@ -1,28 +0,0 @@ -/* - horizontal-group-item.hh -- declare Horizontal_group_item - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - - -#ifndef HORIZONTAL_GROUP_ITEM_HH -#define HORIZONTAL_GROUP_ITEM_HH - -#include "horizontal-group-element.hh" -#include "axis-group-item.hh" - -/** - Group stuff in horizontal sense. Example: Paper_column - */ -class Horizontal_group_item : public Axis_group_item, public Horizontal_group_element { -protected: - virtual void do_print() const; -public: - Horizontal_group_item (); - - VIRTUAL_COPY_CONS(Score_element); -}; - -#endif // HORIZONTAL_GROUP_ITEM_HH diff --git a/lily/include/horizontal-vertical-group-element.hh b/lily/include/horizontal-vertical-group-element.hh deleted file mode 100644 index 90043a7cce..0000000000 --- a/lily/include/horizontal-vertical-group-element.hh +++ /dev/null @@ -1,33 +0,0 @@ -/* - horizontal-vertical-group-element.hh -- declare Horizontal_vertical_group_element - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys - - */ - -#ifndef HORIZONTAL_VERTICAL_GROUP_ELEM_HH -#define HORIZONTAL_VERTICAL_GROUP_ELEM_HH - -#include "vertical-group-element.hh" -#include "horizontal-group-element.hh" - -/** A class to treat a group of elements as a single entity. The - dimensions are the unions of the dimensions of what it contains. - Translation means translating the contents. - */ -class Horizontal_vertical_group_element : public Vertical_group_element, - public Horizontal_group_element -{ -protected: -public: - Horizontal_vertical_group_element (); - - -}; - - -#endif /* HORIZONTAL_VERTICAL_GROUP_ELEM_HH */ - - diff --git a/lily/include/horizontal-vertical-group-item.hh b/lily/include/horizontal-vertical-group-item.hh deleted file mode 100644 index e5f7bbfe17..0000000000 --- a/lily/include/horizontal-vertical-group-item.hh +++ /dev/null @@ -1,30 +0,0 @@ -/* - horizontal-vertical-group-item.hh -- declare Horizontal_vertical_group_item - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - - -#ifndef HORIZONTAL_VERTICAL_GROUP_ITEM_HH -#define HORIZONTAL_VERTICAL_GROUP_ITEM_HH - -#include "axis-group-item.hh" -#include "horizontal-vertical-group-element.hh" - - -/** - Treat a collection of items as a unity - */ -class Horizontal_vertical_group_item : public Axis_group_item, public Horizontal_vertical_group_element { -protected: - virtual void do_print() const; - VIRTUAL_COPY_CONS(Score_element); -public: - Horizontal_vertical_group_item (); - - -}; - -#endif // HORIZONTAL_VERTICAL_GROUP_ITEM_HH diff --git a/lily/include/killing-cons.tcc b/lily/include/killing-cons.tcc deleted file mode 100644 index f6fcff7bd1..0000000000 --- a/lily/include/killing-cons.tcc +++ /dev/null @@ -1,44 +0,0 @@ -/* - 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/lily/include/span-score-bar.hh b/lily/include/span-score-bar.hh deleted file mode 100644 index 164c1f567d..0000000000 --- a/lily/include/span-score-bar.hh +++ /dev/null @@ -1,29 +0,0 @@ -/* - span-score-bar.hh -- declare Span_score_bar - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - - -#ifndef SPAN_SCORE_BAR_HH -#define SPAN_SCORE_BAR_HH - -#include "span-bar.hh" -#include "score-bar.hh" - -class Span_score_bar : public Span_bar, public Score_bar -{ -public: - - VIRTUAL_COPY_CONS(Score_element); - Span_score_bar(); - -protected: - virtual void do_pre_processing(); -}; - - - -#endif // SPAN_SCORE_BAR_HH diff --git a/lily/include/vertical-align-spanner.hh b/lily/include/vertical-align-spanner.hh deleted file mode 100644 index d1a67b4623..0000000000 --- a/lily/include/vertical-align-spanner.hh +++ /dev/null @@ -1,25 +0,0 @@ -/* - 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" - -class Vertical_align_spanner : public Align_element, public Spanner -{ -public: - - VIRTUAL_COPY_CONS(Score_element); - Vertical_align_spanner (); - virtual void do_print() const ; - -}; -#endif // VERTICAL_ALIGN_SPANNER_HH diff --git a/lily/include/vertical-group-element.hh b/lily/include/vertical-group-element.hh deleted file mode 100644 index a4066aa6df..0000000000 --- a/lily/include/vertical-group-element.hh +++ /dev/null @@ -1,27 +0,0 @@ -/* - vertical-group-element.hh -- declare - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys - - */ - -#ifndef VERTICAL_GROUP_ELEM_HH -#define VERTICAL_GROUP_ELEM_HH - -#include "axis-group-element.hh" -/** - Like Horizontal_group_element, but in X direction - */ -class Vertical_group_element : public virtual Axis_group_element { -protected: - virtual Interval do_height() const; - -public: - Vertical_group_element () ; - -}; - -#endif /* VERTICAL_GROUP_ELEM_HH */ - diff --git a/lily/include/vertical-group-spanner.hh b/lily/include/vertical-group-spanner.hh deleted file mode 100644 index 9726ca64b2..0000000000 --- a/lily/include/vertical-group-spanner.hh +++ /dev/null @@ -1,28 +0,0 @@ -/* - vertical-group-spanner.hh -- declare Vertical_group_spanner - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - - -#ifndef SPAN_VERTICAL_GROUP_HH -#define SPAN_VERTICAL_GROUP_HH - -#include "axis-group-spanner.hh" -#include "vertical-group-element.hh" - -/** An element which groups a line. - */ -class Vertical_group_spanner : public Axis_group_spanner, public Vertical_group_element -{ -protected: - VIRTUAL_COPY_CONS(Score_element); -public: - - Vertical_group_spanner (); -}; - - -#endif // SPAN_VERTICAL_GROUP_HH diff --git a/lily/vertical-align-spanner.cc b/lily/vertical-align-spanner.cc deleted file mode 100644 index 5419c7913b..0000000000 --- a/lily/vertical-align-spanner.cc +++ /dev/null @@ -1,23 +0,0 @@ -/* - vertical-align-spanner.cc -- implement Vertical_align_spanner - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - -#include "vertical-align-spanner.hh" - - - - -Vertical_align_spanner::Vertical_align_spanner () -{ - axis_ = Y_AXIS; -} - -void -Vertical_align_spanner::do_print ()const -{ - Align_element::do_print () ; -} diff --git a/lily/vertical-group-elem.cc b/lily/vertical-group-elem.cc deleted file mode 100644 index 6beef8811e..0000000000 --- a/lily/vertical-group-elem.cc +++ /dev/null @@ -1,26 +0,0 @@ -/* - vertical-group-elem.cc -- implement Horizontal_vertical_group_element - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - -#include "vertical-group-element.hh" -#include "interval.hh" -#include "item.hh" -#include "debug.hh" - - -Vertical_group_element::Vertical_group_element() - : Axis_group_element (Y_AXIS,Y_AXIS) -{ -} - -Interval -Vertical_group_element::do_height() const -{ - return Graphical_axis_group::extent (Y_AXIS); -} - - diff --git a/lily/vertical-group-spanner.cc b/lily/vertical-group-spanner.cc deleted file mode 100644 index bab93119cf..0000000000 --- a/lily/vertical-group-spanner.cc +++ /dev/null @@ -1,16 +0,0 @@ -/* - vertical-group-spanner.cc -- implement Vertical_group_spanner - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys -*/ - -#include "vertical-group-spanner.hh" -#include "item.hh" -#include "p-col.hh" - -Vertical_group_spanner::Vertical_group_spanner () -{ - axes_[0] = axes_[1] = Y_AXIS; -} -- 2.39.5