lilypond-0.0.67

diff --git a/lily/include/bar-reg.hh b/lily/include/bar-reg.hh
index 5879cb948bbbf5f17e297ec0d57bf3cb514c09b6..f871915a01ccc69eddd23d590c2724a53a597933 100644 (file)
--- a/lily/include/bar-reg.hh
+++ b/lily/include/bar-reg.hh
@@ -25,7 +25,7 @@ public:
     virtual void pre_move_processing();
     virtual void post_move_processing();
     Bar_register();
-    NAME_MEMBERS(Bar_register);
+    NAME_MEMBERS();
 };
 
 #endif // BARREG_HH

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index ea23bd07bccfdf5bbc74f537c699f901113e4d3b..eecc32f51fb0bc1c98ee583a6607bc0154f9dabc 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -14,7 +14,7 @@ class Bar:public Item {
 public:
     String type;
     
-    NAME_MEMBERS(Bar);
+    NAME_MEMBERS();
     Bar(String type);
 private:
     void do_print() const;

diff --git a/lily/include/bow.hh b/lily/include/bow.hh
index 76330c079c44121a0e5005438d63c1a6c8c6bbc5..c69214a542655da347f3601a6d98ae9023854bcd 100644 (file)
--- a/lily/include/bow.hh
+++ b/lily/include/bow.hh
@@ -25,7 +25,7 @@ protected:
     Molecule*brew_molecule_p()const;
 public:
     Bow();
-    NAME_MEMBERS(Bow);
+    NAME_MEMBERS();
     Offset center() const;  
 };
 #endif // BOW_HH

diff --git a/lily/include/clef-item.hh b/lily/include/clef-item.hh
index d0e29994ef3720397ac3a58e7f03e7a05af3a0f4..23e346c083d49dfb3db49c066263bfd201b49582 100644 (file)
--- a/lily/include/clef-item.hh
+++ b/lily/include/clef-item.hh
@@ -24,7 +24,7 @@ public:
     bool change;
 
     /* *************** */
-NAME_MEMBERS(Clef_item);
+NAME_MEMBERS();
     Clef_item();
     void read(Clef_register const&);
     void read(String);

diff --git a/lily/include/clef-reg.hh b/lily/include/clef-reg.hh
index 28cbd4643ceab37383926995dceaf0728d265dd6..b78f3dd682a55096f758c1197a4f3524f4e5ec2e 100644 (file)
--- a/lily/include/clef-reg.hh
+++ b/lily/include/clef-reg.hh
@@ -31,7 +31,7 @@ public:
     /* ************** */
    
     Clef_register();
-    NAME_MEMBERS(Clef_register);
+    NAME_MEMBERS();
    
 };
 #endif // CLEF_HH

diff --git a/lily/include/collision-reg.hh b/lily/include/collision-reg.hh
index b0b3b6dc8a86a3b6d28f1c5920ec0fd77dc2992f..5eef92a9e96aed244cfa3c5c38badffb0b61768a 100644 (file)
--- a/lily/include/collision-reg.hh
+++ b/lily/include/collision-reg.hh
@@ -20,6 +20,6 @@ protected:
     virtual void pre_move_processing();
 public:
     Collision_register();
-    NAME_MEMBERS(Collision_register);
+    NAME_MEMBERS();
 };
 #endif // COLLISION_REG_HH

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index be8d6bd506d05b6e3242f49cde47cf4dffbad917..62cee06041d52a641664141ef1250eb34335a5ab 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -23,7 +23,7 @@ protected:
     virtual void do_pre_processing();
 public:
     Link_array<Note_column> clash_l_arr_;
-    NAME_MEMBERS(Collision);
+    NAME_MEMBERS();
     void add (Note_column*ncol_l);
     Collision();
     

diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh
index 72ff2c1d1be9034755663bf43ee39f121eda1880..56a3e1a9212599941eb1212fa4550513c370a69e 100644 (file)
--- a/lily/include/crescendo.hh
+++ b/lily/include/crescendo.hh
@@ -28,7 +28,7 @@ public:
 protected:
     SPANNER_CLONE(Crescendo)
     virtual Molecule*brew_molecule_p()const;
-    NAME_MEMBERS(Crescendo);
+    NAME_MEMBERS();
     
 private:
     

diff --git a/lily/include/dynamic-reg.hh b/lily/include/dynamic-reg.hh
index 17f769053cd21063638f89d8adeb3940360f2c91..72823a79a1026c11cc5dea48cf260732a1b893dd 100644 (file)
--- a/lily/include/dynamic-reg.hh
+++ b/lily/include/dynamic-reg.hh
@@ -23,7 +23,7 @@ class Dynamic_register : public Request_register {
 public:
     Dynamic_register();
     ~Dynamic_register();
-    NAME_MEMBERS(Dynamic_register);
+    NAME_MEMBERS();
 protected:
     virtual void acknowledge_element(Score_elem_info);
     virtual bool try_request(Request *req_l);

diff --git a/lily/include/elem-group.hh b/lily/include/elem-group.hh
index 0e544adbc0f06b22070451cab33c8a559e19b966..c0a23ccbcb826a1bfd6f3e0f67530a55643394d7 100644 (file)
--- a/lily/include/elem-group.hh
+++ b/lily/include/elem-group.hh
@@ -28,7 +28,7 @@ protected:
 public:
     Element_group();
     Element_group(Element_group const&);
-    NAME_MEMBERS(Element_group);
+    NAME_MEMBERS();
     virtual void translate(Offset);
     virtual void add_element(Score_elem*);
     virtual String TeX_string()const;

diff --git a/lily/include/head-reg.hh b/lily/include/head-reg.hh
index 5e47743db1b5fbfa0e588e1c589de66fba61eb87..82487b688202d71ece28cea1456f5523a1b0687d 100644 (file)
--- a/lily/include/head-reg.hh
+++ b/lily/include/head-reg.hh
@@ -19,7 +19,7 @@ struct Note_head_register : Request_register {
     virtual void process_requests();
     virtual void pre_move_processing();
     virtual void post_move_processing();
-    NAME_MEMBERS(Note_head_register);
+    NAME_MEMBERS();
 };
 
 

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 3c030d122c68275e56df7bc134a00283c9c324c3..4ddc3ebd6c9ceaeadf13b5ce55590760b4466b4c 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -31,7 +31,7 @@ public:
     virtual Item *item() { return this; }
     Item();
     Real hpos_f() const;
-    NAME_MEMBERS(Item);
+    NAME_MEMBERS();
     virtual Line_of_score * line_l() const;
 protected:
     virtual void do_print()const;

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index 1e2207beab86ed24fe3ded572eaae9ba01413ab4..4b4c347eef9b47cfc24bf3137e2114e43521c2d9 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -19,7 +19,7 @@ struct Key_item : Item {
 
     
     /* *************** */
-NAME_MEMBERS(Key_item);
+NAME_MEMBERS();
     Key_item(int cposition);
     void add(int pitch, int acc);
     void read(const Key_register&);

diff --git a/lily/include/key-reg.hh b/lily/include/key-reg.hh
index b6e21224d927ca25a0f3d0e0b0c3165b56d79a43..bfa5fd05141d3bf8d36684a6f114ce2d98da05b8 100644 (file)
--- a/lily/include/key-reg.hh
+++ b/lily/include/key-reg.hh
@@ -27,7 +27,7 @@ struct Key_register : Request_register {
     virtual void post_move_processing();
     virtual void acknowledge_element(Score_elem_info);
     Key_register();
-    NAME_MEMBERS(Key_register);
+    NAME_MEMBERS();
 private:
     
     void read_req(Key_change_req * r);

diff --git a/lily/include/local-key-reg.hh b/lily/include/local-key-reg.hh
index e1278019170a656920823b1d059b15ac4add8603..98abf99ccd4232e27e6eb70c5988005243fe303b 100644 (file)
--- a/lily/include/local-key-reg.hh
+++ b/lily/include/local-key-reg.hh
@@ -24,7 +24,7 @@ struct Local_key_register : Request_register {
     virtual void acknowledge_element(Score_elem_info);
     virtual void pre_move_processing();
     Local_key_register();
-    NAME_MEMBERS(Local_key_register);
+    NAME_MEMBERS();
 };
 
 #endif // LOCALKEYREG_HH

diff --git a/lily/include/lyric-register.hh b/lily/include/lyric-register.hh
index 304bf5c6cf66d2e7db86250e241e90485f442eec..083654e66f9df87f8308fc1adfac0b741e8e4128 100644 (file)
--- a/lily/include/lyric-register.hh
+++ b/lily/include/lyric-register.hh
@@ -21,7 +21,7 @@ class Lyric_register : public Request_register {
     virtual void process_requests();
     virtual void post_move_processing();
 public:
-    NAME_MEMBERS(Lyric_register);
+    NAME_MEMBERS();
     Lyric_register();
 };
 #endif // LYRIC_REGISTER_HH

diff --git a/lily/include/meter-reg.hh b/lily/include/meter-reg.hh
index 300c72da9fe617d2ac40a4c8037f1277636bc39c..5930ea08d9739a0a533f1c739e226156c992f5e1 100644 (file)
--- a/lily/include/meter-reg.hh
+++ b/lily/include/meter-reg.hh
@@ -24,6 +24,6 @@ public:
     virtual void pre_move_processing();
     virtual void post_move_processing();
     Meter_register();
-    NAME_MEMBERS(Meter_register);
+    NAME_MEMBERS();
 };
 #endif // METERREG_HH

diff --git a/lily/include/meter.hh b/lily/include/meter.hh
index b923785256de98a892d66f16efc07181505dc434..7cd1d40ac315add00b2940cf17bb07f9e436f7fa 100644 (file)
--- a/lily/include/meter.hh
+++ b/lily/include/meter.hh
@@ -23,7 +23,7 @@ protected:
     Molecule*brew_molecule_p() const;
 public:
     Meter(Array<Scalar> args) ;
-    NAME_MEMBERS(Meter);
+    NAME_MEMBERS();
 };
 #endif // METER_HH
 

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index 0ccb399a03a1de60ad2f8224e6cb0089e3cc6bbf..37021a214ee9e0f335e01dc1ab40ef470e5b10af 100644 (file)
--- a/lily/include/molecule.hh
+++ b/lily/include/molecule.hh
@@ -4,27 +4,6 @@
 #include "lily-proto.hh"
 #include "plist.hh"
 #include "boxes.hh"
-#include "symbol.hh"
-
-/// a symbol which can be translated, and freely copied
-struct Atom {
-    Offset off;
-    Symbol sym;
-
-    /* *************** */
-    
-    void translate(Offset o) {
-       off += o;
-    }
-    
-    /// how big is #this#?
-    Box extent() const;
-    Atom(Symbol s);
-
-    void print() const;
-
-    String TeX_string() const;
-};
 
 
 /** a group of individually translated symbols. You can add molecules
@@ -35,7 +14,7 @@ struct Molecule {
     /* *************** */
     
     Molecule() { }
-    Molecule(Atom a) { add(a) ; }
+    Molecule(Atom const &a) { add(a) ;}
 
     void add_right(const Molecule &m);
     void add_left(const Molecule &m);
@@ -43,7 +22,7 @@ struct Molecule {
     void add_bottom(const Molecule &m);
     void add(Molecule const &m);
     void translate(Offset);
-    void add(Atom a) { ats.bottom().add(new Atom(a)); }
+    void add(Atom const & a) ;
     /// how big is #this#? 
     Box extent() const;
 

diff --git a/lily/include/note-column-reg.hh b/lily/include/note-column-reg.hh
index 7925621e65a3117aa41da5eef21c6599e3729506..45b8d4d4fb3c0d3f77693d233c5fc5f69db8e9a8 100644 (file)
--- a/lily/include/note-column-reg.hh
+++ b/lily/include/note-column-reg.hh
@@ -32,6 +32,6 @@ protected:
     virtual void post_move_processing();
 public:
     Note_column_register();
-    NAME_MEMBERS(Note_column_register);
+    NAME_MEMBERS();
 };
 #endif // NOTE_COLUMN_REG_HH

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 32b1a18e11ba657e9a7a001a92831d9be9d6b03f..805b969bbc1f5d278474977b405109a0650f0c88 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -33,7 +33,7 @@ public:
     int dir_i_;
    
         
-    NAME_MEMBERS(Note_column);
+    NAME_MEMBERS();
     Note_column();
     void add(Note_head *);
     void add(Stem *);