lilypond-0.0.24

diff --git a/Makefile b/Makefile
index 584d0dc60c2db92312a496c58d73839824b9094a..c2b59dc66ae50e9e333eb50419dab3227dd7d12c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,33 +3,30 @@ include Variables.make
 .SUFFIXES:
 .SUFFIXES: .cc .o .hh .y .l .pod .txt .1 .dep
 
+
 $(exe): $(obs)
        $(CXX) -o $@ $^ $(LOADLIBES)
 
-depend:        ; # automatically by gnu make.
 clean:
-       rm -f $(exe) objects/*.o $(DOCDIR)/* core  
-       $(MAKE) -C $(CCDIR) clean
-       $(MAKE) -C $(HEADERDIR) clean
+       rm -f $(exe) $(DOCDIR)/* core $(obs)
+       for SUBDIR in $(SUBDIRS); \
+       do \
+               $(MAKE) SUBDIR=$$SUBDIR -C $$SUBDIR clean;\
+       done
 
 distclean: clean
        rm -f  version.hh $(gencc) .GENERATE *~ deps/*.dep
 
 all: kompijl doc
 
-# doc++ documentation of classes
 doc:
        $(MAKE) -C Documentation doc
 
+# doc++ documentation of classes
 docpp: $(progdocs)
        -mkdir $(DOCDIR)
        doc++ -p -I -d $(DOCDIR) $^
 
-%.o: $(CCDIR)/%.cc
-       $(DODEP)\
-       $(CXX) -c $(CXXFLAGS) $^  -o $(OBJECTDIR)/$@
-
-
 $(OBJECTDIR)/%.o: $(CCDIR)/%.cc
        $(DODEP)\
        $(CXX) -c $(CXXFLAGS) $(OUTPUT_OPTION) 

diff --git a/hdr/simplestaff.hh b/hdr/simplestaff.hh
index bdd1f061361e9793bb0a0c40a71009a5485f08d5..531f994d6e8594ca0b84a0ae111b2a45e1d085b8 100644 (file)
--- a/hdr/simplestaff.hh
+++ b/hdr/simplestaff.hh
@@ -10,7 +10,7 @@
 #include "key.hh"
 #include "stcol.hh"
 #include "staff.hh"
-#include "swalker.hh"
+#include "staffwalker.hh"
 
 /*
    mega-stupido staffs and cols: they do notes one at each moment.   
@@ -34,6 +34,7 @@ struct Simple_column : Staff_column {
     Beam_req *beam_;
     Simple_staff* staff_l_;
     Text_req *text_;
+    Lyric_req* lreq_p_;
     
     /****************/
     Slur_req  * find_slur(Voice *);
@@ -52,7 +53,7 @@ struct Simple_column : Staff_column {
 /// Simple  staff: one voicegroup  at a time
 struct Simple_staff : Staff {
     /// indirection to the PStaff.
-    PStaff *theline;
+    PStaff *theline_l_;
 
     /****************/
     Staff_column*create_col(Score_column*);

diff --git a/input/Makefile b/input/Makefile
index 439a77eddce16a76cfc263287f5690066e03d81d..cf9a3c5d6a5d039005fb004ac5d62e412d9b6a5a 100644 (file)
--- a/input/Makefile
+++ b/input/Makefile
@@ -1,7 +1,7 @@
 default: ;
 
 DISTFILES=Makefile  kortjakje.ly pavane.ly  maartje.ly\
-       cadenza.ly scales.ly standchen.lily
+       cadenza.ly scales.ly standchen.lily twinkle.ly
 
 dist:
        ln $(DISTFILES) $(DDIR)/$(SUBDIR)

diff --git a/input/standchen.lily b/input/standchen.lily
index 9af02f0a5d3a06a78e61be358c3f577546cdf129..a7e4d370eb697aaeac394b1ab72d4be56f854c05 100644 (file)
--- a/input/standchen.lily
+++ b/input/standchen.lily
@@ -30,9 +30,9 @@
 %%1
 melodie = music { $ 
        \duration{ 8 }
-       r_"pp" { [ d `a-^ } f-^ { d `a-^ } f-^ { d `a-^ ] }
+       r_"pp" { [ d `a-| } f-| { d `a-| } f-| { d `a-| ] }
 %%2
-       r { [ d `bes-^ } f-^ { d `bes-^ } f-^ { d `bes-^ ] }
+       r { [ d `bes-| } f-| { d `bes-| } f-| { d `bes-| ] }
 %%3
        r_"simile" { [ d `bes } e { d `bes } e { d `bes ] }
 %%4
@@ -365,7 +365,7 @@ score {
                }
        }
        commands { 
-               meter 3 4 
+               meter 3*4 
                skip 4:0
                bar ":|"
                skip 32:0

diff --git a/src/inputstaff.cc b/src/inputstaff.cc
index c121984cd08aba4feed722be521a2ba1c516ae06..70d91c669f8ce9d4d5f01f899b1cf6a23c6aff6f 100644 (file)
--- a/src/inputstaff.cc
+++ b/src/inputstaff.cc
@@ -7,6 +7,7 @@
 #include "staffcommands.hh"
 #include "melodicstaff.hh"
 #include "rhythmstaff.hh"
+#include "lyricstaff.hh"
 #include "staff.hh"
 
 void
@@ -38,6 +39,8 @@ Input_staff::parse(Score*score_l)
        p = new Melodic_staff;
     else if (type == "rhythmic")
        p = new Rhythmic_staff;
+    else if (type == "lyric")
+       p = new Lyric_staff;
     p->score_l_ = score_l;
     p->define_spot_str_ = define_spot_str_;
     

diff --git a/src/simplestaff.cc b/src/simplestaff.cc
index 83bce6d7e4afb762500fbd545bad20e4f7d7c4db..e4e4986ef1ecd5dd8f970a2c7d35fdf96c3d0879 100644 (file)
--- a/src/simplestaff.cc
+++ b/src/simplestaff.cc
@@ -1,6 +1,6 @@
 #include "request.hh"
 #include "voice.hh"
-#include "swalker.hh"
+#include "staffwalker.hh"
 #include "debug.hh"
 #include "clef.hh"
 #include "staff.hh"
@@ -19,11 +19,12 @@ Simple_column::Simple_column(Score_column*s, Simple_staff *rs)
     staff_l_ = rs;
     beam_ = 0;
     text_=0;
+    lreq_p_ = 0;
 }
 
 Simple_staff::Simple_staff()
 {
-    theline = 0;
+    theline_l_ = 0;
 }
 
 /**
@@ -60,6 +61,11 @@ Simple_column::process_requests()
            if (rq->text()) {
                text_ = rq->text();
            }
+#if 0
+           if (rq->lreq_l()) {
+               lreq_p_ = rq->lreq_l();
+           }
+#endif
            if (rq->beam()) {
                beam_ = rq->beam();
            }