lilypond-0.0.13

diff --git a/hdr/score.hh b/hdr/score.hh
index ea1ef93c237f35430dbffdc9deb01f9ac11c159f..20a4d75da84ea70a84b871b81af8822f5c742ff5 100644 (file)
--- a/hdr/score.hh
+++ b/hdr/score.hh
@@ -10,25 +10,27 @@ struct Score {
     /// paper_, staffs_ and commands_ form the problem definition.
     Paperdef *paper_;
     IPointerList<Staff*> staffs_;
-    Score_commands *commands_;
+
+    svec<Command*> input_commands_;
     
     /// "runtime" fields for setting up spacing    
     IPointerList<Score_column*> cols_;
     PScore *pscore_;
 
     /****************************************************************/
-
+    void add(svec<Command*> &s);
+ 
     /// construction
     void add_staff(Staff *st);
     void set(Paperdef*);
     Score();
     ~Score();    
     void add(Staff*);        
-    void set(Score_commands*);
+
 
 
     void OK() const;
-    Score_column *find_col(Real,bool);
+    PCursor<Score_column *> find_col(Real,bool);
     void process();
     void output(String fn);
     PCursor<Score_column*> create_cols(Real);
@@ -39,8 +41,9 @@ private:
     void do_pcols();    
     void clean_cols();
     void distribute_commands();
-    void do_connect(PCol *c1, PCol *c2, Real d);
-    void connect_nonmus(PCol* c1, PCol *c2, Real d);
+    void do_connect(PCol *c1, PCol *c2, Real d,Real);
+    void connect(PCol* c1, PCol *c2, Real d,Real = 1.0);
+    
     /// add #Idealspacings# to #pscore_#
     void calc_idealspacing();
     /** add the score wide commands (bars, breaks) to each staff so

diff --git a/hdr/staff.hh b/hdr/staff.hh
index a2ac99ed034b92ca357b100b47bb9eafa2bd5dff..803bf8738820359b04c34c7beeae5586c19383d2 100644 (file)
--- a/hdr/staff.hh
+++ b/hdr/staff.hh
@@ -1,9 +1,7 @@
 #ifndef STAFF_HH
 #define STAFF_HH
 
-#include "score.hh"
-#include "voice.hh"
-#include "command.hh"
+#include "staffcommands.hh"
 
 
 /// base class for a collection of voices.
@@ -12,8 +10,8 @@ struct Staff {
     IPointerList<Voice*> voices;
 
     /// commands in chronological order
-    IPointerList<Command *> commands;
-
+    Staff_commands *staff_commands_;
+    
     /// runtime field
     IPointerList<Staff_column*> cols;
 
@@ -21,7 +19,13 @@ struct Staff {
     Score *score_;
     PScore *pscore_;
 
+    svec<Command*> input_commands_;
+        
     /****************************************************************/
+    void add(svec<Command*> &s);
+    void add(PointerList<Voice*> &s);
+    void process_input_commands(svec<Command*> &s, Real l);
+    
     Staff(const Staff&src);
     void add_voice(Voice *v);
     void add_staff_column(Staff_column *sp);
@@ -40,14 +44,6 @@ struct Staff {
     void clean_cols() ;
     Staff_column * get_col(Real,bool);
 
-    void add_commands(PointerList<Command* >const & sv);
-    /**
-    add all commands from sv.
-
-    PRE
-    sv is time-ordered.
-    */
-
     Staff();
     /**
       Should construct with Score as arg, but this isn't known during parsing.      

diff --git a/symbol.ini b/symbol.ini
index 4dc275334782b21cef7c1e6cf3bab007863e42cb..5b1d6e303ebfd7f17493a3ef6ae332032adec18b 100644 (file)
--- a/symbol.ini
+++ b/symbol.ini
@@ -11,6 +11,9 @@ table clefs
        violin  \violinclef 0pt 16pt    -12.5pt 22.5pt
        bass    \bassclef 0pt   16pt    0pt     20pt
        viola   \violaclef 0pt  16pt    0pt     20pt
+       violin_change   \cviolinclef 0pt        16pt    -12.5pt 22.5pt
+       bass_change     \cbassclef 0pt  16pt    0pt     20pt
+       viola_change    \cviolaclef 0pt 16pt    0pt     20pt
 end
 
 table balls
@@ -38,7 +41,7 @@ end
 
 table bars
        empty   \emptybar       0pt     0pt     0pt     0pt
-       |       \maatstreep     0pt     1pt     -12pt   12pt
+       |       \maatstreep     0pt     5pt     -12pt   12pt
        ||      \finishbar      0pt     2pt     -12pt   12pt
 end