lilypond-0.0.61

diff --git a/flower/include/fproto.hh b/flower/include/fproto.hh
index 5f3bdfcff42a9eec36fbbbb616ada6e4e730e8b8..ef4c6422b2da874b00eee81af6301b01b327d6bd 100644 (file)
--- a/flower/include/fproto.hh
+++ b/flower/include/fproto.hh
@@ -21,8 +21,8 @@ template<class T> struct Array;
 template<class T> struct sstack;
 template<class T,class K> struct Assoc;
 template<class T> struct List;
-template<class T> struct PointerList;
-template<class T> struct IPointerList;
+template<class T> struct Pointer_list;
+template<class T> struct IPointer_list;
 template<class T> struct Cursor;
 template<class T> struct PCursor;
 template<class T> struct Link;

diff --git a/flower/include/list.hh b/flower/include/list.hh
index a7389ed489a2ad14ca35ec62c54d0322d7157fe7..cdf57ced99ca6149d735cec18cee0c3194fd9c53 100644 (file)
--- a/flower/include/list.hh
+++ b/flower/include/list.hh
@@ -15,7 +15,7 @@ template<class T> class Link;
    items are always stored as copies in List, but:
    #List<String># :  copies of #String# stored 
    #List<String*># : copies of #String*# stored! 
-   (do not use, use \Ref{PointerList} #<String*># instead.)
+   (do not use, use \Ref{Pointer_list} #<String*># instead.)
  
    {\bf note:} 
    retrieving "invalid" cursors, i.e. 

diff --git a/flower/include/pcursor.hh b/flower/include/pcursor.hh
index 459977a47111595f04c0d06635fe75421fea1ca0..dffe02b9ef1b7149b9c48b76dbd2baf7586f3b49 100644 (file)
--- a/flower/include/pcursor.hh
+++ b/flower/include/pcursor.hh
@@ -10,14 +10,14 @@
 #include "plist.hh"
 #include "cursor.hh"
 
-/**  cursor to go with PointerList. 
-  don't create PointerList<void*>'s.
+/**  cursor to go with Pointer_list. 
+  don't create Pointer_list<void*>'s.
   This cursor is just an interface class for Cursor. It takes care of the
   appropriate type casts
  */
 template<class T>
 class PCursor : private Cursor<void *> {
-    friend class IPointerList<T>;
+    friend class IPointer_list<T>;
 
     /// delete contents
     void junk();
@@ -36,14 +36,14 @@ public:
        return remove_p();
     }
     
-    PointerList<T> &list() { return (PointerList<T>&)Cursor<void*>::list(); }
+    Pointer_list<T> &list() { return (Pointer_list<T>&)Cursor<void*>::list(); }
     PCursor<T> operator++(int) { return Cursor<void*>::operator++(0);}
     PCursor<T> operator--(int) { return Cursor<void*>::operator--(0); }
     PCursor<T> operator+=(int i) { return Cursor<void*>::operator+=(i);}
     PCursor<T> operator-=(int i) { return Cursor<void*>::operator-=(i); }    
     PCursor<T> operator -(int no) const { return Cursor<void*>::operator-(no);}
     int operator -(PCursor<T> op) const { return Cursor<void*>::operator-(op);}
-    PCursor<T> operator +( int no) const {return Cursor<void*>::operator+(no);}    PCursor(const PointerList<T> & l) : Cursor<void*> (l) {}
+    PCursor<T> operator +( int no) const {return Cursor<void*>::operator+(no);}    PCursor(const Pointer_list<T> & l) : Cursor<void*> (l) {}
     PCursor() : Cursor<void*> () {}
     PCursor( const Cursor<void*>& cursor ) : Cursor<void*>(cursor) { }
     void* vptr() const { return *((Cursor<void*> &) *this); }

diff --git a/flower/include/plist.hh b/flower/include/plist.hh
index 80d780e3d61d390fcd761ea6f7058de2e97af96c..afbf942c738e1ea1503179c5bbb9d2b5569aeac5 100644 (file)
--- a/flower/include/plist.hh
+++ b/flower/include/plist.hh
@@ -12,14 +12,14 @@
 /**
   A list of pointers.
   
-  Use for list of pointers, e.g. PointerList<AbstractType*>. 
+  Use for list of pointers, e.g. Pointer_list<AbstractType*>. 
   This class does no deletion of the pointers, but it knows how to
   copy itself (shallow copy). We could have derived it from List<T>,
-  but this design saves a lot of code dup; for all PointerLists in the
+  but this design saves a lot of code dup; for all Pointer_lists in the
   program only one parent List<void*> is instantiated.
   */
 template<class T>
-class PointerList : public List<void *>
+class Pointer_list : public List<void *>
 {
  public:
     PCursor<T> top() const{
@@ -29,11 +29,11 @@ class PointerList : public List<void *>
        return PCursor<T> (List<void*>::bottom());
     }
     PCursor<T> find(T) const;
-    void concatenate(PointerList<T> const &s) { List<void*>::concatenate(s); }
-    PointerList() {}
+    void concatenate(Pointer_list<T> const &s) { List<void*>::concatenate(s); }
+    Pointer_list() {}
 };
 
-/**   PointerList which deletes pointers given to it. 
+/**   Pointer_list which deletes pointers given to it. 
   NOTE:
   
   The copy constructor doesn't do what you'd want:
@@ -41,25 +41,25 @@ class PointerList : public List<void *>
 
     new T(*cursor)
 
-  You have to copy this yourself, or use the macro PointerList__copy
+  You have to copy this yourself, or use the macro Pointer_list__copy
   
   */
 template<class T>
-class IPointerList : public PointerList<T> {
+class IPointer_list : public Pointer_list<T> {
 public:
-    IPointerList(IPointerList const &) { set_empty(); }
-    IPointerList() { }
-    ~IPointerList();
+    IPointer_list(IPointer_list const &) { set_empty(); }
+    IPointer_list() { }
+    ~IPointer_list();
 };
 
-#define IPointerList__copy(T, to, from, op)   \
+#define IPointer_list__copy(T, to, from, op)   \
   for (PCursor<T> _pc_(from); _pc_.ok(); _pc_++)\
       to.bottom().add(_pc_->op)\
   \
 
 
 template<class T>
-void PL_copy(IPointerList<T*> &dst,IPointerList<T*> const&src);
+void PL_copy(IPointer_list<T*> &dst,IPointer_list<T*> const&src);
 
 
 

diff --git a/flower/include/plist.icc b/flower/include/plist.icc
index 8b5f8eea56d8a8eef15b64dd7a2d0078d06ef7fa..f24e0ddf4500ecbc96c3989ac20c5888c74ac37f 100644 (file)
--- a/flower/include/plist.icc
+++ b/flower/include/plist.icc
@@ -9,7 +9,7 @@
 
 template<class T>
 void
-PL_copy(IPointerList<T*> &to, IPointerList<T*> const&src)
+PL_copy(IPointer_list<T*> &to, IPointer_list<T*> const&src)
 {
     for (PCursor<T*> pc(src); pc.ok(); pc++) {
        T *q = pc;

diff --git a/flower/include/plist.tcc b/flower/include/plist.tcc
index d18e01f9025ac64d57d745e83a5633b6fb9358cd..7129cdbe3d2027ba1fd44b6941005c32a2dbe077 100644 (file)
--- a/flower/include/plist.tcc
+++ b/flower/include/plist.tcc
@@ -1,12 +1,12 @@
 #include "plist.hh"
 
-#define PL_instantiate(a)  template class PointerList<a*>; \
+#define PL_instantiate(a)  template class Pointer_list<a*>; \
        template class PCursor<a*>;
 #define IPL_instantiate(a) PL_instantiate(a); \
-       template class IPointerList<a*>
+       template class IPointer_list<a*>
        
 template<class T>
-IPointerList<T>::~IPointerList()
+IPointer_list<T>::~IPointer_list()
 {
     PCursor<T> c( *this );
     while (c.ok()) {
@@ -16,7 +16,7 @@ IPointerList<T>::~IPointerList()
 
 template<class T>
 PCursor<T> 
-PointerList<T>::find(T what ) const
+Pointer_list<T>::find(T what ) const
 {
     PCursor<T> i(*this);
     for (; i.ok(); i++)

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index a85858bad82c9c62d78ca0b0056c2778c9a61118..f1ac0c1eaaee84daf70cffd83393be12daf44e49 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -14,7 +14,7 @@
   make sure that they reach the beam and that point in the correct
   direction */
 struct Beam:  public Directional_spanner {
-    PointerList<Stem*> stems;
+    Pointer_list<Stem*> stems;
     /// the slope of the beam in posns / point (dimension)   
     Real slope;
 

diff --git a/lily/include/input-music.hh b/lily/include/input-music.hh
index 7102ed35eb98a311f645c2e92ff0822cb13941bf..b34fedc18359bf946c11f64bccd596201d47c329 100644 (file)
--- a/lily/include/input-music.hh
+++ b/lily/include/input-music.hh
@@ -12,7 +12,7 @@
 #include "voice.hh"
 #include "moment.hh"
 
-struct Voice_list : public PointerList<Voice*> {
+struct Voice_list : public Pointer_list<Voice*> {
     void translate_time(Moment dt);
 };
 
@@ -67,7 +67,7 @@ struct Simple_music : Input_music {
 
 /// Complex_music consists of multiple voices
 struct Complex_music : Input_music {
-    IPointerList<Input_music*> elts;
+    IPointer_list<Input_music*> elts;
     /* *************** */
     virtual void transpose(Melodic_req const&) const ;
     virtual void set_default_group(String g);

diff --git a/lily/include/input-register.hh b/lily/include/input-register.hh
index 6149121e29b129642e983d05f17d7a3a183d6f88..bf945ab10063ba75da9a26a2623311c7da6ae6f2 100644 (file)
--- a/lily/include/input-register.hh
+++ b/lily/include/input-register.hh
@@ -16,7 +16,7 @@
 #include "input.hh"
 
 struct Input_register : Input { 
-    IPointerList<Input_register*> ireg_list_;
+    IPointer_list<Input_register*> ireg_list_;
     String name_str_;
     
     void add(Input_register*);

diff --git a/lily/include/input-score.hh b/lily/include/input-score.hh
index a55b7a43782183985b8832b24fbf741ea083115e..6e6a3ceaaf98f9bba7c674afb2fc992d3d0f6116 100644 (file)
--- a/lily/include/input-score.hh
+++ b/lily/include/input-score.hh
@@ -24,7 +24,7 @@ public:
     /// paper_, staffs_ and commands_ form the problem definition.
     Paper_def *paper_p_;
     Midi_def* midi_p_;
-    IPointerList<Input_staff*> staffs_;
+    IPointer_list<Input_staff*> staffs_;
 
     
     /* *************************************************************** */

diff --git a/lily/include/input-staff.hh b/lily/include/input-staff.hh
index 0a35b460b6d444b185c371d6fb23cfa5fd95ae0e..0bbdc1326614117cf05f4ff0a6ddf2ccf48da5fd 100644 (file)
--- a/lily/include/input-staff.hh
+++ b/lily/include/input-staff.hh
@@ -16,7 +16,7 @@
 class Input_staff:public Input {
 public:
     
-    IPointerList<Input_music*> music_;
+    IPointer_list<Input_music*> music_;
     Input_register * ireg_p_;
     
     /* *************** */

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index 084321ce4e809be9a755ee93a95acad107f975f6..312111bff283e0a33556326ecd0dd92365d3a4d3 100644 (file)
--- a/lily/include/molecule.hh
+++ b/lily/include/molecule.hh
@@ -30,7 +30,7 @@ struct Atom {
 /** a group of individually translated symbols. You can add molecules
     to the top, to the right, etc.  */
 struct Molecule {
-    IPointerList<Atom*> ats;   // change to List<Atom>? 
+    IPointer_list<Atom*> ats;  // change to List<Atom>? 
 
     /* *************** */
     

diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh
index 2a2dd92afc5d322a3ba9ac5b6327661f737d4e59..58206b4306c0f0dbd9382bc0627eef79bbee1b51 100644 (file)
--- a/lily/include/p-col.hh
+++ b/lily/include/p-col.hh
@@ -22,8 +22,8 @@
 
 class PCol { 
 public:
-    PointerList<Item const *> its;
-    PointerList<Spanner const *> stoppers, starters;
+    Pointer_list<Item const *> its;
+    Pointer_list<Spanner const *> stoppers, starters;
     
     /** prebreak is put before end of line.
     if broken here, then (*this) column is discarded, and prebreak

diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh
index 3177613ec5e89bd4abbe40367ba25b74a1b2856a..0cc7a2bc15469ca7dcde167d21e7cb07f6192034 100644 (file)
--- a/lily/include/p-score.hh
+++ b/lily/include/p-score.hh
@@ -18,25 +18,25 @@ struct PScore {
     Paper_def *paper_l_;
     
     /// the columns, ordered left to right
-    IPointerList<PCol *> cols;
+    IPointer_list<PCol *> cols;
 
     /// the idealspacings, no particular order
-    IPointerList<Idealspacing*> suz;
+    IPointer_list<Idealspacing*> suz;
 
     /// the staffs ordered top to bottom
-    IPointerList<PStaff*> staffs;
+    IPointer_list<PStaff*> staffs;
 
     /// all symbols in score. No particular order.
-    IPointerList<Item*> its;
+    IPointer_list<Item*> its;
 
     /// if broken, the different lines
-    IPointerList<Line_of_score*> lines;
+    IPointer_list<Line_of_score*> lines;
 
     /// crescs etc; no particular order
-    IPointerList<Spanner *> spanners;
+    IPointer_list<Spanner *> spanners;
 
     /// broken spanners
-    IPointerList<Spanner*> broken_spans;
+    IPointer_list<Spanner*> broken_spans;
 
     /* *************** */
     /* CONSTRUCTION */

diff --git a/lily/include/p-staff.hh b/lily/include/p-staff.hh
index c95834c2fb8ab5dd3bedde04144fe87e831acfdd..a1c5fb4daa91ff8fda598e44473569495e8e8ca3 100644 (file)
--- a/lily/include/p-staff.hh
+++ b/lily/include/p-staff.hh
@@ -11,8 +11,8 @@ struct PStaff {
     PScore * pscore_l_;
     
     
-    PointerList<Spanner const *> spans;
-    PointerList<Item*> its;
+    Pointer_list<Spanner const *> spans;
+    Pointer_list<Item*> its;
 
     /* *************** */
     void add(Item*i);

diff --git a/lily/include/pulk-voices.hh b/lily/include/pulk-voices.hh
index 2cc5a48831edd5e5275c6a436811a582ef35e744..e871517388447c89d565cfabfe2027647a99729b 100644 (file)
--- a/lily/include/pulk-voices.hh
+++ b/lily/include/pulk-voices.hh
@@ -34,15 +34,15 @@ int compare(Voice_l const &p1, Voice_l const &p2);
 class Pulk_voices
 {
 PQueue< Voice_l > voice_pq_;
-    IPointerList< Pulk_voice * > pulk_p_list_;
-    PointerList<Staff *> staff_l_list_;
+    IPointer_list< Pulk_voice * > pulk_p_list_;
+    Pointer_list<Staff *> staff_l_list_;
     Moment next_mom_;
 
 public:
     Moment last_;
     bool ok() const;
     Moment next_mom() { return next_mom_; }
-    Pulk_voices(PointerList<Staff*> const&);
+    Pulk_voices(Pointer_list<Staff*> const&);
     void get_aligned_request(Request_column *col_l );
 };
 

diff --git a/lily/include/register-group.hh b/lily/include/register-group.hh
index fcfc4ba5c6dc4e8ed9efc60c5a091445b67494f6..be21d7fd5e4060214988f75cabeb09380fde6123 100644 (file)
--- a/lily/include/register-group.hh
+++ b/lily/include/register-group.hh
@@ -21,7 +21,7 @@
   */
 class Register_group_register : public Request_register {
 protected:
-    IPointerList<Request_register*> reg_list_;
+    IPointer_list<Request_register*> reg_list_;
     virtual void do_print()const;
 public:
 

diff --git a/lily/include/request-column.hh b/lily/include/request-column.hh
index 32a6f63773a9a03c073f1f0212d2ad212bf4366b..e3d5d3184e94b401601fd10c4a3f7ff61dc06d79 100644 (file)
--- a/lily/include/request-column.hh
+++ b/lily/include/request-column.hh
@@ -18,12 +18,12 @@
  */
 class Request_column 
 {
-    IPointerList<Staff_column*> staff_cols_;
+    IPointer_list<Staff_column*> staff_cols_;
     Array<Staff_column*> staff_col_l_arr_;
     
 public:
     Score_column *musical_column_l_, *command_column_l_;
-    Request_column(PointerList<Staff*> const& );
+    Request_column(Pointer_list<Staff*> const& );
     bool used_b()const;
     Moment when();
     void add_reqs(int staff_idx, Array<Request*> const&);

diff --git a/lily/include/rest-column.hh b/lily/include/rest-column.hh
index 04e86e581adb99d08785ce0a17ef9d3a71b3ae90..a753c61d937315affa61e9b3d4f519b32ff91e5c 100644 (file)
--- a/lily/include/rest-column.hh
+++ b/lily/include/rest-column.hh
@@ -23,6 +23,7 @@ public:
     void add(Notehead *);
     NAME_MEMBERS(Rest_column);
     void translate_y(Real dy);
+    Rest_column();
 };
 
 #endif // REST_COLUMN_HH

diff --git a/lily/include/score.hh b/lily/include/score.hh
index e83540533b60aff0e26e0ecd7274209e616bc836..7376e9797655121d4ce584c75a7e1268fba14b34 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -24,12 +24,12 @@ struct Score {
     /// paper_, staffs_ and commands_ form the problem definition.
     Paper_def *paper_p_;
     Midi_def *midi_p_;
-    IPointerList<Staff*> staffs_;
+    IPointer_list<Staff*> staffs_;
     
     /// "runtime" fields for setting up spacing    
-    IPointerList<Request_column*> rcols_;
+    IPointer_list<Request_column*> rcols_;
     
-    IPointerList<Score_column*> cols_;
+    IPointer_list<Score_column*> cols_;
     PScore *pscore_p_;
 
     Input input_;

diff --git a/lily/include/scoreline.hh b/lily/include/scoreline.hh
index 9196a96ab334f984672fdc5e2a253b07c5e17be1..33bbc4a2d874aa4632a55ac46b6dea742421696b 100644 (file)
--- a/lily/include/scoreline.hh
+++ b/lily/include/scoreline.hh
@@ -13,10 +13,10 @@
 /// the columns of a score that form one line.
 struct
 Line_of_score {
-    PointerList<PCol *> cols;
+    Pointer_list<PCol *> cols;
 
     // need to store height of each staff.
-    IPointerList<Line_of_staff*> staffs;
+    IPointer_list<Line_of_staff*> staffs;
     PScore * pscore_l_;        // needed to generate staffs
 
     /* *************** */

diff --git a/lily/include/staff.hh b/lily/include/staff.hh
index e0613136f25bdd952b05e8b28d599d627603ae09..29f6839f7314672a88cd520eee20d86b36b554ef 100644 (file)
--- a/lily/include/staff.hh
+++ b/lily/include/staff.hh
@@ -20,9 +20,9 @@ class Staff {
 public:
     Input_register * ireg_p_;
     
-    PointerList<Voice*> voice_list_;
+    Pointer_list<Voice*> voice_list_;
     /// runtime field
-    PointerList<Staff_column*> cols_;
+    Pointer_list<Staff_column*> cols_;
 
     Score *score_l_;
     PScore *pscore_l_;
@@ -30,7 +30,7 @@ public:
     
     /* *************************************************************** */
 
-    void add(const PointerList<Voice*> &s);
+    void add(const Pointer_list<Voice*> &s);
 
     void add_voice(Voice *v_p);
     Paper_def*paper()const;

diff --git a/lily/include/voice-element.hh b/lily/include/voice-element.hh
index cd02239f5ed966176f3c91b409280d44af87fdac..fc85b58e3b12bd09cf9b9130ce0069607ac6fdff 100644 (file)
--- a/lily/include/voice-element.hh
+++ b/lily/include/voice-element.hh
@@ -24,7 +24,7 @@ public:
       Voice_element */
     Moment duration_;
     Voice const *voice_C_;
-    IPointerList<Request*> req_p_list_;
+    IPointer_list<Request*> req_p_list_;
     Request * principal_req_l_;
 
     /* *************** */

diff --git a/lily/include/voice.hh b/lily/include/voice.hh
index 5ddcc91933c426d4a0645edea7eb17a96c11d8f0..475fc4466856a24a7e7e9b0cd64c91181fe08d71 100644 (file)
--- a/lily/include/voice.hh
+++ b/lily/include/voice.hh
@@ -18,7 +18,7 @@ struct Voice {
     /** the elements, earliest first.
       Please use the member #add()# to add a new element
       */
-    IPointerList<Voice_element *> elts_;
+    IPointer_list<Voice_element *> elts_;
     Moment start_;
 
     /* *************** */