From: fred <fred>
Date: Sun, 24 Mar 2002 19:46:06 +0000 (+0000)
Subject: lilypond-0.0.70pre
X-Git-Tag: release/1.5.59~4568
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c31cfc3d2c80615b70d9e42cfba06f48f5886a17;p=lilypond.git

lilypond-0.0.70pre
---

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index f38d852934..ea81cbbc99 100644
--- 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 447a807f0a..9513fc1533 100644
--- 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 01726c57df..55fbc8a673 100644
--- 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 916e284d57..7e0e632b01 100644
--- 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 ab089f0ffc..a3c9053b34 100644
--- 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 ece423d154..998c1669ee 100644
--- 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 6a799526d0..ce7b75e41a 100644
--- 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 c7c7207d74..5c9dac12bc 100644
--- 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 6132046a26..e12eae39bc 100644
--- 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 fda86e5375..447ea7e078 100644
--- 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 14a50f0f45..176ce6085c 100644
--- 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 0198e98d8c..30d5793253 100644
--- 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 eb4058c6dd..e90ea58a6b 100644
--- 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 4fa49691d8..62d5e73e8c 100644
--- 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 16accf1a83..5cc5c9aa4f 100644
--- 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 7ec510afa2..475458ce97 100644
--- 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 d133fb66b5..aa8747a056 100644
--- 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 2aee51cc2e..1954ca97f7 100644
--- 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 68b1c11d4a..74b387aaad 100644
--- 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 5afdc785c0..ceec013004 100644
--- 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 0cc584f742..0fff834f85 100644
--- 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 70c6a8a7af..8cf2fef4a5 100644
--- 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