lilypond-0.0.70pre

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index f38d85293410fbabf017f9f03037b8885ce824ce..ea81cbbc992fc8eb0ff9496e248de8e4d4a0825c 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,14 +1,14 @@
 /*
-  class-name.hh -- declare 
+  virtual-methods.hh -- declare 
 
-  source file of the LilyPond music typesetter
+  source file of the Flower Library
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 
-#ifndef CLASS_NAME_HH
-#define CLASS_NAME_HH
+#ifndef VIRTUAL_METHODS_HH
+#define VIRTUAL_METHODS_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 
@@ -25,6 +25,7 @@ int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
 
 #define VIRTUAL_COPY_CONS(T, R)\
   virtual R *clone() const { return  new T(*this); } \
+  int  yet_another_stupid_function_to_allow_semicolon()
 
 #define IMPLEMENT_IS_TYPE_B(D)                                                            \
   bool D::is_type_b(const char *s)     const                                      \
@@ -43,4 +44,4 @@ int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
     return s == static_name() || BA::is_type_b(s) || BB::is_type_b(s); \
 }
 
-#endif // CLASS-NAME_HH
+#endif 

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 447a807f0ac048d23c1b21e0d4ddc199c5396fa4..9513fc153310682aa5c75cd51100f5e3115a84cd 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -15,7 +15,7 @@ public:
     String type_str_;
     
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Bar)
+    SCORE_ELEM_CLONE(Bar);
     Bar();
 private:
     void do_print() const;

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 01726c57df993a134e6318a96987c9e5744d5cd0..55fbc8a6730405574c5d209a83fdbf651ec42455 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -27,11 +27,10 @@ public:
     NAME_MEMBERS();
     Beam();
     void add(Stem*);
-    
 
     void set_grouping(Rhythmic_grouping def, Rhythmic_grouping current);
     void set_stemlens();
-    SCORE_ELEM_CLONE(Beam)
+    SCORE_ELEM_CLONE(Beam);
 protected:
     virtual Interval do_width()const;    
     virtual Offset center() const;

diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh
index 916e284d5717421a36f14e7e15ba45dc3ed5f761..7e0e632b01653b3958e777483cb06c9b2022e111 100644 (file)
--- a/lily/include/break-align-item.hh
+++ b/lily/include/break-align-item.hh
@@ -19,7 +19,7 @@ protected:
     virtual void do_pre_processing();
 public:
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Break_align_item)
+    SCORE_ELEM_CLONE(Break_align_item);
        
 };
 #endif // BREAK_ALIGN_ITEM_HH

diff --git a/lily/include/clef-item.hh b/lily/include/clef-item.hh
index ab089f0ffc48dc64fac2335a88e43b6eff9b2ab1..a3c9053b3434a51b0e35dbeac885853df697325a 100644 (file)
--- a/lily/include/clef-item.hh
+++ b/lily/include/clef-item.hh
@@ -28,7 +28,7 @@ public:
 
     /* *************** */
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Clef_item)
+    SCORE_ELEM_CLONE(Clef_item);
     Clef_item();
     void read(Clef_register const&);
     void read(String);

diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh
index ece423d154f2ada9c22327f3441969a47ebdb7e9..998c1669ee022b48abaac3496683c23cf441d66e 100644 (file)
--- a/lily/include/crescendo.hh
+++ b/lily/include/crescendo.hh
@@ -26,7 +26,7 @@ public:
     bool left_dyn_b_;
     Crescendo();
 protected:
-    SCORE_ELEM_CLONE(Crescendo)
+    SCORE_ELEM_CLONE(Crescendo);
     virtual Molecule*brew_molecule_p()const;
     NAME_MEMBERS();
     

diff --git a/lily/include/elem-group-item.hh b/lily/include/elem-group-item.hh
index 6a799526d0ddb89d59ca7bc1b6669c51fb0ff994..ce7b75e41ac60e12b897a309af241cecd28cbc81 100644 (file)
--- a/lily/include/elem-group-item.hh
+++ b/lily/include/elem-group-item.hh
@@ -16,14 +16,14 @@
 class Horizontal_vertical_group_item  : public Item, public Horizontal_vertical_group {
 public:
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Horizontal_vertical_group_item)
+    SCORE_ELEM_CLONE(Horizontal_vertical_group_item);
 protected:
     virtual void do_print() const;
 };
 
 class Horizontal_group_item : public Item, public Horizontal_group {
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Horizontal_group_item)
+    SCORE_ELEM_CLONE(Horizontal_group_item);
 protected:
     virtual void do_print() const { Elbement_group::do_print(); }
 };

diff --git a/lily/include/general-script-def.hh b/lily/include/general-script-def.hh
index c7c7207d74196d971844c6f3962ecc1ecc58a836..5c9dac12bc5cd4a99acf788e156345e50209d7f1 100644 (file)
--- a/lily/include/general-script-def.hh
+++ b/lily/include/general-script-def.hh
@@ -18,7 +18,7 @@
  */
 class General_script_def : public Input {
 public:
-    VIRTUAL_COPY_CONS(General_script_def,General_script_def)
+    VIRTUAL_COPY_CONS(General_script_def,General_script_def);
     NAME_MEMBERS();
     virtual int staff_dir_i()const;
     void print() const;

diff --git a/lily/include/horizontal-align-item.hh b/lily/include/horizontal-align-item.hh
index 6132046a26802127fd4eb17299e259a439d3786e..e12eae39bca9e3767bbaff28c87cbac2a3439e6b 100644 (file)
--- a/lily/include/horizontal-align-item.hh
+++ b/lily/include/horizontal-align-item.hh
@@ -15,20 +15,29 @@
 /**
   Order elems left to right.
 
+  
+
   TODO: insert(order, elem)
   */
 class Horizontal_align_item :  public Item {
 protected:
     Link_array<Item> item_l_arr_;
     Array<int> priority_i_arr_;
-    int align_i_;
     
 public:
+    Item * center_l_;
+    /**
+      Which side to align? 
+      -1: left side, 0: centered (around center_l_ if not nil), 1: right side
+     */
+    int align_i_;
+        
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Horizontal_align_item)
+    SCORE_ELEM_CLONE(Horizontal_align_item);
     void add(Item*, int p);
     Horizontal_align_item();
 protected:
+    
     virtual void do_substitute_dependency(Score_elem * , Score_elem *);
     /// do calculations before determining horizontal spacing
     virtual void do_pre_processing();

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index fda86e5375651cd1a2c9a7bc08196c0c4bd1b1c1..447ea7e078d66f4764c2e6cbb70cf80c30d3b04f 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -20,7 +20,7 @@ struct Key_item : Item {
     
     /* *************** */
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Key_item)
+    SCORE_ELEM_CLONE(Key_item);
 
     Key_item(int cposition);
     void add(int pitch, int acc);

diff --git a/lily/include/meter.hh b/lily/include/meter.hh
index 14a50f0f45aa3dc6d7b74beed251070ed2ac29a5..176ce6085c96d0d16bf752df00ae32e40f8d0631 100644 (file)
--- a/lily/include/meter.hh
+++ b/lily/include/meter.hh
@@ -24,7 +24,7 @@ protected:
 public:
     Meter(Array<Scalar> args) ;
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Meter)
+    SCORE_ELEM_CLONE(Meter);
 };
 #endif // METER_HH
 

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 0198e98d8c6c20bbdbdf6a9b1122d084bbea0336..30d5793253970fc3271c9ef179e1edb717ba1959 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -30,7 +30,7 @@ public:
     Music_list(Music_list const&);    
     Music_list();
     NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Music_list,Music)
+    VIRTUAL_COPY_CONS(Music_list,Music);
     virtual void add(Music*);
     virtual void transpose(Melodic_req const *);
     
@@ -48,7 +48,7 @@ class Chord : public Music_list {
 public:
     Chord();
     NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Chord,Music)
+    VIRTUAL_COPY_CONS(Chord,Music);
     virtual void translate(Moment dt);
     virtual MInterval time_int()const;
 };
@@ -56,7 +56,7 @@ public:
 class Voice_element : public Chord {
 public:
     NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Voice_element,Music)
+    VIRTUAL_COPY_CONS(Voice_element,Music);
 };
 
 /**
@@ -69,7 +69,7 @@ public:
 
     Voice();
     NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Voice, Music)
+    VIRTUAL_COPY_CONS(Voice, Music);
     virtual void translate(Moment dt);
     virtual MInterval time_int()const;
 };
@@ -86,6 +86,6 @@ public:
     String id_str_;
 
     NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Change_reg, Music)
+    VIRTUAL_COPY_CONS(Change_reg, Music);
 };
 #endif // MUSIC_LIST_HH

diff --git a/lily/include/music.hh b/lily/include/music.hh
index eb4058c6ddc4d8333bdfae3f245562cf0c98564f..e90ea58a6bd5381ff1a09bf64dbc37b62488c2f9 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -33,7 +33,7 @@ public:
     void print() const;
     virtual void transpose(Melodic_req const *);
     virtual void translate(Moment dt);
-    VIRTUAL_COPY_CONS(Music,Music)
+    VIRTUAL_COPY_CONS(Music,Music);
     NAME_MEMBERS();
     Music();
 protected:

diff --git a/lily/include/request.hh b/lily/include/request.hh
index 4fa49691d879b03d3ef48ffc681c733293235c27..62d5e73e8ca39b4f5a2e132b6fe8e64e0b9a897f 100644 (file)
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -31,7 +31,7 @@ public:
     virtual ~Request(){}
 
     NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Request,Music)
+    VIRTUAL_COPY_CONS(Request,Music);
     
     void print()const ;
     virtual MInterval time_int() const;
@@ -55,7 +55,7 @@ protected:
 #define REQUESTMETHODS(T,accessor)     \
 virtual T * accessor() { return this;}\
 NAME_MEMBERS();\
-VIRTUAL_COPY_CONS(T, Request)\
+VIRTUAL_COPY_CONS(T, Request);\
 virtual void do_print() const
 
 

diff --git a/lily/include/scoreline.hh b/lily/include/scoreline.hh
index 16accf1a83570b2f0ead047a45c86c964bad157e..5cc5c9aa4f62b980f77fc7796371359915d19ab7 100644 (file)
--- a/lily/include/scoreline.hh
+++ b/lily/include/scoreline.hh
@@ -38,7 +38,7 @@ protected:
     virtual void do_substitute_dependency(Score_elem*,Score_elem*);
     virtual Interval do_width()const;
     virtual void do_print() const;
-    SCORE_ELEM_CLONE(Line_of_score)
+    SCORE_ELEM_CLONE(Line_of_score);
 };
 
 #endif

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 7ec510afa2f10b5a8b4364df0071c2431a29fa1b..475458ce97d2a4a97fe3acb7630a9bc919602028 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -24,7 +24,7 @@ protected:
     virtual void do_post_processing();
     virtual void do_substitute_dependency(Score_elem*, Score_elem*);
     virtual void do_pre_processing();
-    SCORE_ELEM_CLONE(Slur)
+    SCORE_ELEM_CLONE(Slur);
     NAME_MEMBERS();
 };
 

diff --git a/lily/include/spanner-elem-group.hh b/lily/include/spanner-elem-group.hh
index d133fb66b50645564d6330e025cce502f358fc55..aa8747a0563b6427465f9e67d327cfdff88fb79d 100644 (file)
--- a/lily/include/spanner-elem-group.hh
+++ b/lily/include/spanner-elem-group.hh
@@ -18,7 +18,7 @@ class Spanner_elem_group : public Spanner, public Horizontal_vertical_group {
 protected:
     virtual Interval do_width()const;
     virtual void do_print() const;
-    SCORE_ELEM_CLONE(Spanner_elem_group)
+    SCORE_ELEM_CLONE(Spanner_elem_group);
 public:
     NAME_MEMBERS();
 };

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index 2aee51cc2e56dbd4fe80ee951e2dc96244baa31d..1954ca97f7b875ca098fe84c4c67ee134cae5922 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -43,7 +43,7 @@ public:
     bool broken_b() const;
     Spanner* find_broken_piece(Line_of_score*)const;
 protected:
-    SCORE_ELEM_CLONE(Spanner)
+    SCORE_ELEM_CLONE(Spanner);
     virtual void break_into_pieces();
 
     Link_array<Spanner> broken_into_l_arr_;

diff --git a/lily/include/staff-sym.hh b/lily/include/staff-sym.hh
index 68b1c11d4a877a95152a69a844a09cf7520917b3..74b387aaad3d49273359b6a92415bbac7aa1bcb3 100644 (file)
--- a/lily/include/staff-sym.hh
+++ b/lily/include/staff-sym.hh
@@ -28,7 +28,7 @@ public:
     Real inter_note_f()const;
     int steps_i()const;
 protected:
-    SCORE_ELEM_CLONE(Staff_symbol)
+    SCORE_ELEM_CLONE(Staff_symbol);
     virtual Molecule* brew_molecule_p() const;
     virtual void do_print()const;
 };

diff --git a/lily/include/staffline.hh b/lily/include/staffline.hh
index 5afdc785c03cadb7511883012ba7effad989178b..ceec013004e0fb1654d7967de2534103275fb4e7 100644 (file)
--- a/lily/include/staffline.hh
+++ b/lily/include/staffline.hh
@@ -12,7 +12,7 @@
 /// one broken line of staff.
 struct Line_of_staff : public Spanner_elem_group{
 
-    SCORE_ELEM_CLONE(Line_of_staff)
+    SCORE_ELEM_CLONE(Line_of_staff);
 public:
     NAME_MEMBERS();
 

diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh
index 0cc584f742287c582b6fed21647d406d7ade8575..0fff834f857ffb278ac1d0a0aea97514f6be2449 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -16,7 +16,7 @@ class Text_def : public General_script_def {
 protected:
     virtual Atom get_atom(Paper_def* p, int dir_i_)const;
     NAME_MEMBERS();
-    VIRTUAL_COPY_CONS(Text_def,General_script_def)
+    VIRTUAL_COPY_CONS(Text_def,General_script_def);
 public:
     /**
       centered , or aligned?
@@ -29,6 +29,7 @@ public:
     String style_str_;
     
     /* *************** */
+    virtual void do_print() const;
     virtual ~Text_def() {};
     bool do_equal_b(const Text_def&)const;
     Text_def();

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index 70c6a8a7af5d5ea4d7de589f300dfd1423dc3f38..8cf2fef4a53603902e5c24229b8777bd4e32f8d4 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -29,6 +29,6 @@ public:
 
     Tie();
     NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Tie)
+    SCORE_ELEM_CLONE(Tie);
 };
 #endif // TIE_HH