From: fred Date: Sun, 24 Mar 2002 19:51:59 +0000 (+0000) Subject: lilypond-0.0.46.jcn1 X-Git-Tag: release/1.5.59~4221 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2424feff7a2329c6cfb3cf3c3d99ca18a7985fd3;p=lilypond.git lilypond-0.0.46.jcn1 --- diff --git a/Documentation/lilyinput-pre-0.1.pod b/Documentation/lilyinput-pre-0.1.pod deleted file mode 100644 index 1e04b19df0..0000000000 --- a/Documentation/lilyinput-pre-0.1.pod +++ /dev/null @@ -1,150 +0,0 @@ -=head1 NAME - -LilyInput - LilyPond input format - -=head1 DESCRIPTION - -This page globally documents the the LilyPond input format, mudela. -To get a better impression, please study some examples. - -=head2 Overview - -General format of a construct: - - BLOCKNAME { } - -Some types allow declarations: - - IDENTIFIER = BLOCKNAME { - - } - - .. - - BLOCKNAME { - IDENTIFIER - ... - } - - -In musicmode, eg, - - ''!c8.-"text"_v - -and in lyricmode, eg, - - Twin- kle, twin- kle lit- tle star,2 - -a lot of characters parse differently -than in "command" mode, eg, - - identifier = score { .. } - -So you have to signal this to the tokenizer. This is done with -'$'. '$' is a delimiter, which used by the tokenizer only. The same -goes for lyrics, it has a '@' delimiter. - -=item * -musicmode: The brace still is used to group grammatical groups. - -=item * -musicmode: "word" are preceded by a '\' (backslash) - -This means you can write some stuff in a zillion ways: - -=item 1. - $\var = \blockname { ... } $ - -=item 2. - var = blockname { $ ... $ } - -=item 3. - var = $ $ $\blockname { ... $ } - -=head2 Comments - -Not really crystallized; you can use '#' or '%' as line comment - -=head2 other - -LilyPond first reads 'symbol.ini', which contains declarations crucial -to proper operation of LilyPond (symbol tables, note names). - -This language looks a lot like Rayce's (Rayce is a raytracer that I've -written as a hobby project. I used as a practice program for writing -(among others) C++ and Yacc. It also gave me RSI :-( ) which in turn -owes a lot to the POVRay raytracer. Now, I know, musictypesetting and -Raytracing do not necessarily require the same input format, but I was -just to lazy to make up a new and/or better input format. Suggestions -appreciated. -=head1 NAME - -LilyInput - LilyPond input format - -=head1 DESCRIPTION - -This page globally documents the the LilyPond input format, mudela. -To get a better impression, please study some examples. - -=head2 Overview - -General format of a construct: - - BLOCKNAME { } - -Some types allow declarations: - - IDENTIFIER = BLOCKNAME { - - } - - .. - - BLOCKNAME { - IDENTIFIER - ... - } - - -In musicmode, eg, - - ''!c8.-"text"_v - -and in lyricmode, eg, - - Twin- kle, twin- kle lit- tle star,2 - -a lot of characters parse differently -than in "command" mode, eg, - - identifier = score { .. } - -So you have to signal this to the tokenizer. This is done with -'$'. '$' is a delimiter, which used by the tokenizer only. The same -goes for lyrics, it has a '@' delimiter. - -=item * -musicmode: The brace still is used to group grammatical groups. - -=item * -musicmode: "word" are preceded by a '\' (backslash) - -This means you can write some stuff in a zillion ways: - -=item 1. - $\var = \blockname { ... } $ - -=item 2. - var = blockname { $ ... $ } - -=item 3. - var = $ $ $\blockname { ... $ } - -=head2 Comments - -Not really crystallized; you can use '#' or '%' as line comment - -=head2 other - -LilyPond first reads 'symbol.ini', which contains declarations crucial -to proper operation of LilyPond (symbol tables, note names). diff --git a/flower/include/cursor.inl b/flower/include/cursor.inl deleted file mode 100644 index 54d3703e60..0000000000 --- a/flower/include/cursor.inl +++ /dev/null @@ -1,113 +0,0 @@ - // cursor.inl -*-c++-*- -#ifndef CURSOR_INL -#define CURSOR_INL -#include - - -template -inline -Cursor::Cursor( const List& list, Link* pointer ) : - list_((List&) list ) -{ - if ( list.size() ) - pointer_ = pointer ? pointer : list.top_; - else - pointer_ = pointer; -} - -template -inline -Cursor::Cursor( const Cursor& cursor ) : - list_( cursor.list_ ) -{ - pointer_ = cursor.pointer_; -} - -template -inline T& -Cursor::thing() -{ - assert( pointer_ ); - return pointer_->thing(); -} - -template -Cursor -Cursor::operator =( const Cursor& c ) -{ - assert( &list_ == &c.list_ ); - pointer_ = c.pointer_; - return *this; -} - -template -inline void -Cursor::add( const T& th ) -{ - list_.add( th, *this ); -} - -template -inline void -Cursor::insert( const T& th ) -{ - list_.insert( th, *this ); -} - -template -inline List& -Cursor::list() const -{ - return list_; -} - -template -inline Link* -Cursor::pointer() -{ - return pointer_; -} - -template -inline bool -Cursor::backward() -{ - return ( pointer_ != 0 ); -} - -template -inline bool -Cursor::forward() -{ - return ( pointer_ != 0 ); -} - -template -inline bool -Cursor::ok() -{ - return ( pointer_ != 0 ); -} - - -template -inline Cursor -Cursor::operator ++( int ) -{ - Cursor r (*this); - assert( pointer_ ); - pointer_ = pointer_->next(); - return r; -} - -template -inline Cursor -Cursor::operator --( int ) -{ - Cursor r (*this); - assert( pointer_ ); - pointer_ = pointer_->previous(); - return r; -} - -#endif diff --git a/flower/include/link.inl b/flower/include/link.inl deleted file mode 100644 index 3926d6bc2a..0000000000 --- a/flower/include/link.inl +++ /dev/null @@ -1,102 +0,0 @@ -// link.inl -*-c++-*- -#ifndef LINK_INL -#define LINK_INL -#include -template -inline -void -Link::OK() const -{ -#ifndef NDEBUG - if (previous_) { - assert(previous_->next_ == this); - } - if (next_) { - assert(next_->previous_ == this); - } -#endif -} - -template -inline -Link::Link( const T& thing ) : - thing_( thing ) -{ - previous_ = next_ = 0; -} - -template -inline -Link::Link( Link* previous, Link* next, const T& thing ) : - thing_( thing ) -{ - previous_ = previous; - next_ = next; -} - -template -inline -Link* -Link::next() -{ - return next_; -} - -template -inline -Link* -Link::previous() -{ - return previous_; -} - -template -inline -void -Link::add( const T& thing ) -{ - - Link* l = new Link( this, next_, thing ); - if ( next_ ) - next_->previous_ = l; - next_ = l; -} - -template -inline void -Link::insert( const T& thing ) -{ - // Link* l = new Link( next_, this, thing ); - // bugfix hwn 16/9/96 - Link* l = new Link( previous_, this, thing ); - if ( previous_ ) - previous_->next_ = l; - previous_ = l; -} - -/* - don't forget to adjust #l#'s top_ and bottom_. - */ -template -inline void -Link::remove(List &l) -{ - if ( previous_ ) - previous_->next_ = next_; - else - l.top_ = next_; - - if ( next_ ) - next_->previous_ = previous_; - else - l.bottom_ = previous_; -} - -template -inline -T& -Link::thing() -{ - return thing_; -} -#endif diff --git a/flower/include/list.inl b/flower/include/list.inl deleted file mode 100644 index df0687b7c8..0000000000 --- a/flower/include/list.inl +++ /dev/null @@ -1,56 +0,0 @@ -// -*-c++-*- - -#ifndef LIST_INL -#define LIST_INL - -template -inline -List::List() -{ - set_empty(); -} - -template -inline void -List::set_empty() -{ - top_ = bottom_ = 0; - size_ = 0; -} - -template -inline void -List::remove( Cursor me ) -{ - if ( me.ok() ){ - Link *lp = me.pointer(); - lp->remove(*this); - delete lp; - size_--; - } -} - -template -inline int -List::size() const -{ - return size_; -} - -template -inline Cursor -List::top()const -{ - return Cursor( *this, top_ ); -} - - -template -inline Cursor -List::bottom()const -{ - return Cursor( *this, bottom_ ); -} - - -#endif diff --git a/flower/include/plist.inl b/flower/include/plist.inl deleted file mode 100644 index 82be364334..0000000000 --- a/flower/include/plist.inl +++ /dev/null @@ -1,21 +0,0 @@ -/* -*-c++-*- - plist.inl -- part of flowerlib - - (c) 1996 Han-Wen Nienhuys& Jan Nieuwenhuizen -*/ - -#ifndef PLIST_INL -#define PLIST_INL - -template -void -PL_copy(IPointerList &to, IPointerList const&src) -{ - for (PCursor pc(src); pc.ok(); pc++) { - T *q = pc; - T *p=new T(*q) ; - to.bottom().add(p); - } -} - -#endif diff --git a/flower/include/smat.hh b/flower/include/smat.hh deleted file mode 100644 index 05bdac464b..0000000000 --- a/flower/include/smat.hh +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef SMAT_HH -#define SMAT_HH -#include "varray.hh" -#include "vsmat.hh" -#include "real.hh" -/// simplest matrix storage. refer to its baseclass for the doco. -class Full_storage : public virtual_smat -{ - /// height, width - int h,w; - /// maxima. - int maxh, maxw; - - /// the storage - Real** els; - void - init() { - els=0; - h=w=maxh=maxw=0; - - } - - bool valid(int i, int j) const { - return (i>=0 && i < h) - && (j < w && j >=0); - } - - - void resize_rows(int); - void resize_cols(int); - -public: - virtual int rows() const { - return h; - } - virtual int cols() const { - return w; - } - - - virtual void set_size(int i, int j) - { - resize(i,j); //this could be more efficient. - } - - virtual void set_size(int i) { - set_size(i,i); - } - virtual void resize(int i, int j); - virtual void resize(int i) { - resize(i,i); - } - - virtual Real& elem(int i,int j) { - assert(valid(i,j)); - return els[i][j]; - } - virtual Real const & elem(int i, int j) const { - assert(valid(i,j)); - return els[i][j]; - } - virtual Array row(int i) const; - virtual Array column(int j) const; - - Full_storage() { - init(); - } - Full_storage(int i, int j) { - init(); - set_size(i,j); - } - Full_storage(Full_storage&); - Full_storage(int i) { - init(); - set_size(i); - } - void OK() const; - void operator=(Full_storage const &); - - virtual void insert_row(int k); - virtual void delete_row(int k); - virtual void delete_column(int k); - - - ~Full_storage(); - virtual bool mult_ok(int i, int j)const; - virtual void mult_next(int &i, int &j) const ; - virtual bool trans_ok(int i, int j) const; - virtual void trans_next(int &i, int &j) const; - virtual virtual_smat * clone(); -}; - -#endif diff --git a/flower/include/string-data.inl b/flower/include/string-data.inl deleted file mode 100644 index 5a3bb390ef..0000000000 --- a/flower/include/string-data.inl +++ /dev/null @@ -1,210 +0,0 @@ -/* -*-C++-*- - String_data.inl -- implement String_data - - source file of Flower lib - - (c) 1997 Han-Wen Nienhuys -*/ - -#ifndef STRINGDATA_INL -#define STRINGDATA_INL - -#include -#include - -#include "string-data.hh" -const int INITIALMAX=8; - -#include - -INLINE void -String_data::OKW() -{ - assert (references == 1); -} - -INLINE void -String_data::OK() -{ - assert(maxlen >= length_i_); - assert(bool(data_byte_p_)); - assert(references >= 1); -} - - -INLINE -String_data::String_data() -{ - references=0; - maxlen = INITIALMAX; - data_byte_p_ = new Byte[maxlen + 1]; - data_byte_p_[0] = 0; - length_i_ = 0; -} - -INLINE -String_data::String_data(String_data const &src) -{ - references=0; - maxlen = length_i_ = src.length_i_; - data_byte_p_ = new Byte[maxlen+1]; // should calc GNU 8byte overhead. - memcpy( data_byte_p_, src.data_byte_p_, length_i_ + 1 ); -} - -INLINE -String_data::~String_data() -{ - assert(references == 0); - delete[] data_byte_p_; -} - -INLINE void -String_data::setmax(int j) -{ - OKW(); - if (j > maxlen) { - delete data_byte_p_; - maxlen = j; - data_byte_p_ = new Byte[maxlen + 1]; - - data_byte_p_[0] = 0; - length_i_ = 0; - } -} - -/* this is all quite hairy: - update of length_i_ - update of maxlen - alloc of buffer - copying of buffer - needs blondification: - split tasks - define change authority -*/ -INLINE void -String_data::remax(int j) -{ - OKW(); - if (j > maxlen) { - Byte *p = new Byte[j + 1]; - memcpy( p, data_byte_p_, ( maxlen = 0 && j <= length_i_); - data_byte_p_[j] = 0; - length_i_ = j; -} - -INLINE bool -String_data::is_binary_bo()const -{ -// return !memchr(data_byte_p_, length_i_, 0); - return ( (int)strlen( (char const*)data_byte_p_ ) != length_i_ ); -} - -INLINE Byte& -String_data::operator [](int j) -{ - assert(j >= 0 && j <= length_i_); - return data_byte_p_[j] ; -} - -INLINE Byte -String_data::operator [](int j) const -{ - assert(j >= 0 && j <= length_i_); - return data_byte_p_[j]; -} - - - - -#endif // __STRING_UTIL_CC // diff --git a/flower/include/string-handle.inl b/flower/include/string-handle.inl deleted file mode 100644 index 63b2ab379d..0000000000 --- a/flower/include/string-handle.inl +++ /dev/null @@ -1,156 +0,0 @@ -/* -*-c++-*- - - stringhandle.inl -- implement String_handle - - source file of Flower lib - - (c) 1997 Han-Wen Nienhuys -*/ - -#ifndef STRINGHANDLE_INL -#define STRINGHANDLE_INL - -#include -#include - -#include "string-data.hh" -#include "string-handle.hh" - -INLINE void -String_handle::down() -{ - if (!(--data->references)) delete data; data = 0; -} - -/// increase ref count -INLINE void -String_handle::up(String_data *d) -{ - data=d; data->references ++; -} - -INLINE void -String_handle::copy() -{ - if (data->references !=1){ - String_data *newdata = new String_data(*data); - down(); - up(newdata); - } -} - -INLINE -String_handle::String_handle() -{ - up(new String_data); -} - -INLINE -String_handle::~String_handle() -{ - down(); -} - -INLINE -String_handle::String_handle(String_handle const & src) -{ - up(src.data); -} - -INLINE Byte* -String_handle::byte_l() -{ - copy(); - return data->byte_l(); -} - -INLINE char* -String_handle::ch_l() -{ - copy(); - return (char*)data->byte_l(); -} - -INLINE Byte -const* String_handle::byte_C() const -{ - return data->byte_C(); -} - -INLINE char const* -String_handle::ch_C() const -{ - return (char const*)data->byte_C(); -} - -INLINE void -String_handle::operator =(String_handle const &src) -{ - if (this == &src) - return; - down(); - up(src.data); -} - -INLINE void -String_handle::operator += (char const *s) -{ - copy(); - *data += s; -} - - -INLINE Byte -String_handle::operator[](int j) const -{ - return (*data)[j]; -} - -// !NOT SAFE! -// don't use this for loops. Use byte_C() -INLINE Byte & -String_handle::operator[](int j) -{ - copy(); // hmm. Not efficient - return data->byte_l()[j]; -} - -INLINE void -String_handle::append( Byte const* byte_C, int length_i ) -{ - copy(); - data->append( byte_C, length_i ); -} - -INLINE void -String_handle::set( Byte const* byte_C, int length_i ) -{ - copy(); - data->set( byte_C, length_i ); -} - -INLINE void -String_handle::operator = (char const *p) -{ - copy(); - data->set( p ); -} - -INLINE void -String_handle::trunc(int j) -{ - copy(); data->trunc(j); -} - -INLINE int -String_handle::length_i() const -{ - return data->length_i_; -} - -INLINE bool -String_handle::is_binary_bo() const { - return data->is_binary_bo(); -} - -#endif diff --git a/flower/include/vsmat.hh b/flower/include/vsmat.hh deleted file mode 100644 index b9dcdadecb..0000000000 --- a/flower/include/vsmat.hh +++ /dev/null @@ -1,141 +0,0 @@ -#ifndef VSMAT_HH -#define VSMAT_HH -#include "varray.hh" -#include "real.hh" -/** base class for interface with matrix storageclasses. There are no - iterators for matrixclasses, since matrices are (like arrays) - explicitly int-indexed. - - Iteration is provided by *_next, *_ok, which update and check both - index variables simultaneously. - - TODO - determine type of product matrix. - -*/ -class virtual_smat { - - -public: - /// check invariants - virtual void OK() const=0; - - /// height of matrix - virtual int rows() const = 0; - - /// width of matrix - virtual int cols() const = 0; - - - /** set the size. contents lost. - PRE - i >=0, j>=0 - */ - virtual void set_size(int i, int j) = 0; - - /**set the size to square dimen. contents lost - PRE - i>=0 - */ - virtual void set_size(int i) = 0; - /**set the size to i. - - keep contents. If enlarged contents unspecified - - PRE - i>=0, j>=0 - - */ - virtual void resize(int i, int j) = 0; - - /** - set the size to square dimen. contents kept - Keep contents. If enlarged contents are unspecified - - PRE - i>=0 - */ - virtual void resize(int i) = 0; - - - /** - access an element. - - Generate an errormessage, if this happens - in the 0-part of a sparse matrix. - */ - - virtual Real& elem(int i,int j) = 0; - - /// access a element, no modify - virtual Real const & elem(int i, int j) const = 0; - -#if 1 - virtual Array row(int i) const = 0; - virtual Array column(int j) const = 0; -#endif - - - /** - add a row to the matrix before row k. Contents - of added row are unspecified - - 0 <= k <= rows() - */ - virtual void insert_row(int k)=0; - - - /** - delete a row from this matrix. - - PRE - 0 <= k < rows(); - */ - virtual void delete_row(int k)=0; - virtual void delete_column(int k)=0; - virtual ~virtual_smat() { } - virtual virtual_smat *clone()=0; - - - - /** - at end of matrix?. when doing loop - - for(i=0; i= h && maxw >= w); - assert(h >= 0 && w >= 0); - assert(els||!maxh); -#endif -} -void -Full_storage::resize_cols(int newh) -{ - if (newh <= maxh) { - h=newh; - return; - } - - Real ** newa=new Real*[newh]; - int j=0; - for (; j < h; j++) - newa[j] = els[j]; - for (; j < newh; j++) - newa[j] = new Real[maxw]; - delete[] els; - els=newa; - - h = maxh = newh; -} - -void -Full_storage::resize_rows(int neww) -{ - if (neww <= maxw) { - w=neww; - return; - } - for (int i=0; i < maxh ; i++) { - Real* newa = new Real[neww]; - for (int k=0; k < w; k++) - newa[k] = els[i][k]; - - delete[] els[i]; - els[i] = newa; - } - w = maxw = neww; -} - -Full_storage::~Full_storage() { - for (int i=0; i < maxh; i++) - delete [] els[i]; - delete[] els; -} - -void -Full_storage::resize(int rows, int cols) -{ - OK(); - resize_cols(rows); - resize_rows(cols); - -} - - -bool -Full_storage::mult_ok(int i, int j) const -{ - return valid(i,j); -} - -bool -Full_storage::trans_ok(int i, int j) const -{ - return valid(i,j); -} - - -void -Full_storage::trans_next(int &i, int &j) const -{ - assert(trans_ok(i,j)); - i++; - if (i >= h) { - i=0; - j ++; - } -} - -void -Full_storage::mult_next(int &i, int &j) const -{ - assert(mult_ok(i,j)); - j++; - if (j >= w) { - j=0; - i++; - } -} - -void -Full_storage::delete_column(int k) -{ - assert(0 <= k &&k k ; i--) - for (int j=0; j -Full_storage::row(int n) const -{ - Array r; - for (int j = 0; j < w; j++) - r.push(els[n][j]); - return r; -} - -Array -Full_storage::column(int n) const -{ - - Array r; - for (int i = 0; i -*/ - - -#ifndef CLASS_NAME_HH -#define CLASS_NAME_HH - -/** a macro to declare the classes name as a static and virtual function. - The static_name() can *not* be inlined (this might have the effect that - s->name() != S::static_name(). Overlapping strings need not be merged in C++ - */ -#define NAME_MEMBERS(c) \ -static char const *static_name();\ -virtual char const *name() const{ return c::static_name(); } \ -int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out() - -#define IMPLEMENT_STATIC_NAME(c)\ - char const *c::static_name() { return #c; } - -#endif // CLASS-NAME_HH diff --git a/lily/include/lyric-staff.hh b/lily/include/lyric-staff.hh deleted file mode 100644 index fb88c5e5aa..0000000000 --- a/lily/include/lyric-staff.hh +++ /dev/null @@ -1,24 +0,0 @@ -/* - lyricstaff.hh -- part of LilyPond - - copyright 1997 Jan Nieuwenhuizen - */ - -#ifndef LYRICSTAFF_HH -#define LYRICSTAFF_HH - -#include "staff.hh" - -/** - Hungarian prefix lstaff - */ -struct Lyric_staff : Staff { - virtual void set_output(PScore *); - virtual Staff_walker *get_walker_p(); -}; - -#endif // LYRICSTAFF_HH - - - - diff --git a/lily/include/lyric-walker.hh b/lily/include/lyric-walker.hh deleted file mode 100644 index 1a80523883..0000000000 --- a/lily/include/lyric-walker.hh +++ /dev/null @@ -1,28 +0,0 @@ -// -// lyricwalker.hh -- declare Lyric_walker -// -// (c) 1996,97 Han-Wen Nienhuys, Jan Nieuwenhuizen -// - -#ifndef LYRICWALKER_HH -#define LYRICWALKER_HH - -#include "proto.hh" -#include "grouping.hh" -#include "staff-walker.hh" - -/// a simple walker which collects words, and then print them, first on top -struct Lyric_walker: Staff_walker { - Array litem_l_array_; - - /* *************** */ - virtual void process_requests(); - - Lyric_walker(Lyric_staff* lstaff_l); - Lyric_staff* lstaff_l(); -}; - - -#endif // LYRICWALKER_HH - - diff --git a/lily/include/staffsym.hh b/lily/include/staffsym.hh deleted file mode 100644 index bcec2bfaff..0000000000 --- a/lily/include/staffsym.hh +++ /dev/null @@ -1,30 +0,0 @@ -/* - staffsym.hh -- declare Staff_symbol - - source file of the LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef STAFFSYM_HH -#define STAFFSYM_HH -#include "spanner.hh" -/** - This spanner draws the lines of a pstaff. - The bottom line is position 0. - */ -class Staff_symbol : public Spanner -{ -public: - /// this many lines. - int no_lines_i_; - - NAME_MEMBERS(Staff_symbol); - Staff_symbol(int lines); - virtual Molecule* brew_molecule_p() const; - void set_extent(PCol* p1, PCol* p2); - virtual void do_print()const; - virtual Spanner *do_break_at( PCol *c1, PCol *c2) const; -}; -#endif // STAFFSYM_HH diff --git a/lily/lyric-staff.cc b/lily/lyric-staff.cc deleted file mode 100644 index 77d276187c..0000000000 --- a/lily/lyric-staff.cc +++ /dev/null @@ -1,22 +0,0 @@ -#include "musical-request.hh" -#include "voice.hh" -#include "staff-walker.hh" -#include "debug.hh" -#include "staff.hh" -#include "lyric-staff.hh" -#include "lyric-walker.hh" -#include "p-score.hh" - -void -Lyric_staff::set_output(PScore*pscore_l) -{ - pstaff_l_ = new PStaff(pscore_l); - pscore_l_ = pscore_l; - pscore_l_->add(pstaff_l_); -} - -Staff_walker* -Lyric_staff::get_walker_p() -{ - return new Lyric_walker(this); -} diff --git a/lily/lyric-walker.cc b/lily/lyric-walker.cc deleted file mode 100644 index 6643215ea3..0000000000 --- a/lily/lyric-walker.cc +++ /dev/null @@ -1,39 +0,0 @@ -/* - lyricwalker.cc -- implement Lyric_walker - - source file of the LilyPond music typesetter - - (c) 1997 Jan Nieuwenhuizen -*/ - -#include "musical-request.hh" -#include "voice.hh" -#include "p-score.hh" -#include "lyric-staff.hh" -#include "lyric-walker.hh" -#include "debug.hh" -#include "lyric-item.hh" -#include "staff-column.hh" - -void -Lyric_walker::process_requests() -{ - allow_break(); - - int req_count=0; - for (int i = 0; i < ptr()->musicalreq_l_arr_.size(); i++) { - Lyric_req * lreq_l = ptr()->musicalreq_l_arr_[i]->lreq_l(); - if (!lreq_l) - continue; - Item *lp = new Lyric_item(lreq_l,req_count++); - ptr()->typeset_musical_item( lp); - } -} - -Lyric_walker::Lyric_walker(Lyric_staff* lstaff_l) - : Staff_walker(lstaff_l, lstaff_l->pstaff_l_->pscore_l_) -{ - -} - - diff --git a/lily/staffsym.cc b/lily/staffsym.cc deleted file mode 100644 index 0ad2411589..0000000000 --- a/lily/staffsym.cc +++ /dev/null @@ -1,48 +0,0 @@ -/* - staffsym.cc -- implement Staff_symbol - - source file of the LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ -#include "staffsym.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "debug.hh" - - - -Staff_symbol::Staff_symbol(int l) -{ - no_lines_i_ = l; -} - -IMPLEMENT_STATIC_NAME(Staff_symbol); - -void -Staff_symbol::do_print()const -{ - mtor << "lines: " << no_lines_i_; -} - -Molecule* -Staff_symbol::brew_molecule_p() const -{ - Atom a = paper()->lookup_l()->linestaff(no_lines_i_, width().length()); - return new Molecule(a); -} - -Spanner* -Staff_symbol::do_break_at(PCol*p1, PCol*p2)const -{ - Staff_symbol *span_p=new Staff_symbol(*this); - return span_p; -} - -void -Staff_symbol::set_extent(PCol*p1, PCol*p2) -{ - assert(p1&&p2); - left = p1; - right = p2; -} diff --git a/lily/voice-elt.cc b/lily/voice-elt.cc deleted file mode 100644 index 4e33437886..0000000000 --- a/lily/voice-elt.cc +++ /dev/null @@ -1,106 +0,0 @@ -/* - voice-elt.cc -- implement Voice_element - - source file of the LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "proto.hh" -#include "plist.hh" -#include "debug.hh" -#include "voice.hh" -#include "voice-element.hh" -#include "musical-request.hh" -#include "command-request.hh" - - -void -Voice_element::transpose(Melodic_req const&d)const -{ - for (iter_top(reqs,i); i.ok(); i++) { - i->transpose(d); - } -} - -void -Voice_element::print() const -{ -#ifndef NPRINT - mtor << "voice_element { dur :"<< duration_ <<"\n"; - for (iter_top(reqs,rc); rc.ok(); rc++) { - rc->print(); - } - mtor << "}\n"; -#endif -} - -void -Voice_element::add(Request*r) -{ - if (r->duration()) { - assert (!duration_ || duration_ == r->duration()); - duration_ = r->duration(); - } - - r->elt_l_ = this; - reqs.bottom().add(r); -} - - -Voice_element::Voice_element() -{ - voice_l_ = 0; - duration_ = 0; - defined_ch_C_ = 0; -} - -Voice_element::Voice_element(Voice_element const&src) -{ - defined_ch_C_ = src.defined_ch_C_; - - voice_l_=0; - for (iter_top(src.reqs, i); i.ok(); i++) - add(i->clone()); - -} -bool -Voice_element::find_plet_start_b(char c, Moment& moment_r) -{ - assert( c == ']' ); - moment_r += duration_; - for ( PCursor i( reqs.top() ); i.ok(); i++ ) { - if (i->beam() && i->beam()->spantype == Span_req::START ) - return true; - } - return false; -} - -void -Voice_element::set_default_group(String s) -{ - for (iter_top(reqs, i); i.ok(); i++) - if (i->groupchange()) - return ; - Group_change_req *greq = new Group_change_req; - greq->newgroup_str_ = s; - add(greq); -} - -void -Voice_element::set_plet_backwards(Moment& now_moment_r, - Moment until_moment, int num_i, int den_i) -{ - now_moment_r += duration_; - if ( now_moment_r > until_moment ) - return; - for ( PCursor i( reqs.top() ); i.ok(); i++ ) { - if (i->beam() && i->beam()->spantype == Span_req::START ) - i->beam()->nplet = den_i; - if (i->rhythmic()) { - i->rhythmic()->duration_.plet_.type_i_ = den_i; - i->rhythmic()->duration_.plet_.iso_i_ = num_i; - - } - } -} diff --git a/make/Sources.make b/make/Sources.make deleted file mode 100644 index 6411aa2e5a..0000000000 --- a/make/Sources.make +++ /dev/null @@ -1,137 +0,0 @@ -# kept in dist bo stripping stable stuff, still to copy... - -# Sources.make -# sourcefiles to be shipped. Also used for dependencies - -hdr=bar.hh barreg.hh beam.hh\ - binary-source-file.hh\ - boxes.hh break.hh clefreg.hh clefitem.hh\ - colhpos.hh commandrequest.hh \ - complexwalker.hh complexstaff.hh\ - const.hh debug.hh dimen.hh directionalspanner.hh\ - glob.hh grouping.hh headreg.hh idealspacing.hh\ - identifier.hh identparent.hh \ - inputmusic.hh inputscore.hh inputstaff.hh\ - inputfile.hh\ - item.hh key.hh keyitem.hh\ - keyreg.hh\ - keyword.hh leastsquares.hh lexer.hh linespace.hh \ - localkeyitem.hh localkeyreg.hh lookup.hh \ - lyricitem.hh lyricstaff.hh lyricwalker.hh\ - main.hh meter.hh meterreg.hh\ - mididef.hh midiitem.hh midioutput.hh midistream.hh\ - midiwalker.hh\ - misc.hh\ - molecule.hh moment.hh musicalrequest.hh\ - notehead.hh notename.hh offset.hh paperdef.hh\ - parseconstruct.hh pcol.hh proto.hh\ - pscore.hh pstaff.hh qlp.hh\ - qlpsolve.hh register.hh registergroup.hh reqtodo.hh \ - request.hh rest.hh scorecolumn.hh score.hh\ - scoreline.hh scorewalker.hh script.hh scriptdef.hh scriptreg.hh \ - slur.hh slurreg.hh source.hh sourcefile.hh\ - spanner.hh staff.hh\ - staffelem.hh staffeleminfo.hh staffline.hh staffsym.hh stembeamreg.hh\ - staffcolumn.hh stem.hh staffwalker.hh symbol.hh symtable.hh\ - tex.hh textdef.hh \ - textitem.hh textreg.hh textspanner.hh timedescription.hh \ - tstream.hh voice.hh\ - voiceregs.hh voicegroupregs.hh walkregs.hh - -mycc=bar.cc barreg.cc beam.cc \ - binary-source-file.cc\ - boxes.cc break.cc calcideal.cc clefreg.cc\ - clefitem.cc colhpos.cc commandrequest.cc\ - complexstaff.cc complexwalker.cc \ - debug.cc dimen.cc\ - directionalspanner.cc\ - grouping.cc groupregs.cc headreg.cc\ - idealspacing.cc identifier.cc\ - inputmusic.cc inputscore.cc\ - inputstaff.cc\ - inputfile.cc\ - item.cc key.cc keyitem.cc \ - keyreg.cc keyword.cc\ - leastsquares.cc lexerinit.cc linespace.cc \ - localkeyitem.cc localkeyreg.cc lookup.cc\ - lyricitem.cc lyricstaff.cc lyricwalker.cc\ - main.cc meter.cc meterreg.cc\ - mididef.cc midiitem.cc midioutput.cc midistream.cc\ - midiwalker.cc misc.cc molecule.cc mylexer.cc note.cc\ - notehead.cc notename.cc\ - paperdef.cc pcol.cc pscore.cc pstaff.cc qlp.cc qlpsolve.cc\ - register.cc registergroup.cc request.cc rest.cc\ - scorecolumn.cc score.cc\ - scoreline.cc scores.cc scorewalker.cc script.cc\ - scriptdef.cc scriptreg.cc slur.cc\ - slurreg.cc source.cc sourcefile.cc\ - spanner.cc staff.cc\ - staffelem.cc staffline.cc staffsym.cc\ - stembeamreg.cc staffcolumn.cc stem.cc\ - staffeleminfo.cc staffwalker.cc symbol.cc\ - symtable.cc tex.cc texbeam.cc\ - texslur.cc textdef.cc textitem.cc textreg.cc textspanner.cc\ - timedescription.cc tstream.cc voice.cc voiceelt.cc \ - voiceregs.cc voicegroupregs.cc\ - walkregs.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc wordwrap.cc\ - template1.cc template2.cc template3.cc template4.cc\ - template5.cc template6.cc version.cc - -# a bit of a hack to keep exec size under control. -stablecc=request.cc bar.cc boxes.cc break.cc \ - item.cc keyword.cc leastsquares.cc \ - lookup.cc molecule.cc meter.cc\ - paperdef.cc parser.cc lexer.cc pstaff.cc qlp.cc qlpsolve.cc\ - template1.cc template2.cc template3.cc template4.cc\ - template5.cc template6.cc version.cc tstream.cc tex.cc\ - voice.cc wordwrap.cc spanner.cc - - -# mi2mu headers -# -mymi2muhh=\ - duration.hh\ - lily-stream.hh\ - midi-event.hh\ - midi-main.hh\ - midi-score.hh\ - midi-track.hh\ - my-midi-lexer.hh\ - my-midi-parser.hh\ - track-column.hh\ - -# - -# mi2mu shared headers -# -mymi2musharedhh=\ - binary-source-file.hh\ - -# - -# mi2mu source -# -mymi2mucc=\ - duration.cc\ - lily-stream.cc\ - midi-event.cc\ - midi-main.cc\ - midi-score.cc\ - midi-template.cc\ - midi-track.cc\ - my-midi-lexer.cc\ - my-midi-parser.cc\ - track-column.cc\ - -# - -# mi2mu shared source -# -mymi2musharedcc=\ - binary-source-file.cc\ - inputfile.cc\ - sourcefile.cc\ - source.cc\ - -# -