lilypond-0.0.67

diff --git a/lily/include/score-elem.hh b/lily/include/score-elem.hh
index 463c8e23520b7851888d32c293ff3f65cbee9aee..d567f8ef02d25f1fbc4eeed9ab378f9aabc0f654 100644 (file)
--- a/lily/include/score-elem.hh
+++ b/lily/include/score-elem.hh
@@ -10,7 +10,6 @@
 #include "parray.hh"
 #include "lily-proto.hh"
 #include "offset.hh"
-#include "molecule.hh"
 #include "virtual-methods.hh"
 #include "directed-graph.hh"
 
@@ -66,7 +65,7 @@ public:
 
     virtual ~Score_elem();
     Score_elem();
-    NAME_MEMBERS(Score_elem);    
+    NAME_MEMBERS();    
     virtual bool is_type_b(const char *);
     
     Interval width() const;

diff --git a/lily/include/script.hh b/lily/include/script.hh
index e55d252ff1a1b0e62c0f6363ad3262a76db76543..b48ea8ebd6f98d6671d1b413fd48a24363ff099e 100644 (file)
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -15,14 +15,10 @@
   Accents that are put over a note-group.
  */
 class Script : public Item, public Staff_side {
-     /**
-      Vertical dir of symbol. -1 means invert the symbol.
-     */
-    int symdir_i_;
     
     int pos_i_;
     
-    Script_def *specs_l_;
+    General_script_def *specs_l_;
     Stem *stem_l_;
 
     /* *************** */
@@ -32,7 +28,7 @@ protected:
     virtual void do_pre_processing();
     virtual Interval do_width() const;
 private:
-    void set_symdir();
+
     void set_default_dir();
     void set_default_index();
     Symbol symbol()const;
@@ -40,7 +36,7 @@ public:
     static int compare(Script  *const&, Script *const&) ;
     Script(Script_req*);
     void set_stem(Stem*);
-    NAME_MEMBERS(Script);
+    NAME_MEMBERS();
 
 };
 

diff --git a/lily/note.cc b/lily/note.cc
index 6b0062095823c7aca3ce0e10d5235dea1f692cb3..e0c974aa9a41786db1fae90e00f63d21ed9c336a 100644 (file)
--- a/lily/note.cc
+++ b/lily/note.cc
@@ -9,7 +9,7 @@
 #include "musical-request.hh"
 #include "command-request.hh"
 #include "voice.hh"
-
+#include "script.hh"
 #include "identifier.hh"
 #include "varray.hh"
 #include "text-def.hh"
@@ -18,16 +18,6 @@
 #include "voice-element.hh"
 
 
-Request*
-get_plet_request( char c, int dur_i, int type_i )
-{
-    Plet_req* plet_req_p = new Plet_req;
-    plet_req_p->dur_i_ = dur_i;
-    plet_req_p->type_i_ = type_i;
-    plet_req_p->type_c_ = c;
-    return plet_req_p;
-}
-
 String *
 get_scriptdef(char c)
 {
@@ -58,7 +48,9 @@ get_scriptdef(char c)
 Request*
 get_script_req(int d , Script_def*def)
 {
-    Script_req* script_req_p = new Script_req(d, def);
+    Musical_script_req* script_req_p = new Musical_script_req;
+    script_req_p->dir_i_ =d;
+    script_req_p->scriptdef_p_=def;
     return script_req_p;
 }
 

diff --git a/lily/staff-column.cc b/lily/staff-column.cc
index 750dd9d00d029bfaa7faaa7ac1de64071b27cc2b..55871e0761b46c68c377eee33fb196ebf21e958a 100644 (file)
--- a/lily/staff-column.cc
+++ b/lily/staff-column.cc
@@ -51,11 +51,12 @@ Staff_column::add_reqs(Array<Request*> req_l_arr)
                !c_l->measuregrouping())
                setup_one_request(j);   
        } else {
-           if (j->rhythmic()) {
-               req_col_l_->musical_column_l_->add_duration(j->rhythmic()->duration());
-           }
            if (j->musical()) {
+               
                Musical_req*m = j->musical();
+               if (m->rhythmic()) {
+                   req_col_l_->musical_column_l_->add_duration(m->rhythmic()->duration());
+               }
                if(m->skip())
                    continue;
            }

diff --git a/lily/super-elem.cc b/lily/super-elem.cc
index 4db5cff606ead52c77a32384b37bae8a5b5c174f..792f97f503fa9e2a120fcfe0adfbcf666361d00b 100644 (file)
--- a/lily/super-elem.cc
+++ b/lily/super-elem.cc
@@ -9,6 +9,7 @@
 #include "super-elem.hh"
 #include "scoreline.hh"
 #include "p-score.hh"
+#include "string.hh"
 
 String
 Super_elem::TeX_string()const

diff --git a/lily/template1.cc b/lily/template1.cc
index 875c711482dad64f786ed64ecf779b7f427ed191..676fb4b7fbfbd111234d93848a1216b93daf0acb 100644 (file)
--- a/lily/template1.cc
+++ b/lily/template1.cc
@@ -15,7 +15,6 @@
 #include "spanner.hh"
 #include "scoreline.hh" 
 #include "staffline.hh"
-
 #include "pcursor.tcc"
 #include "plist.tcc"