lilypond-0.0.23

diff --git a/hdr/simplestaff.hh b/hdr/simplestaff.hh
index f074dc169d6541029f0a1915f257355a0a548552..bdd1f061361e9793bb0a0c40a71009a5485f08d5 100644 (file)
--- a/hdr/simplestaff.hh
+++ b/hdr/simplestaff.hh
@@ -1,7 +1,7 @@
 /*
   simplestaff.hh -- part of LilyPond
 
-  (c) 1996 Han-Wen Nienhuys
+  (c) 1996,97 Han-Wen Nienhuys
 */
 
 #ifndef SIMPLESTAFF_HH
@@ -32,7 +32,7 @@ struct Simple_column : Staff_column {
     Stem_req *stem_;
     Moment stem_requester_len;
     Beam_req *beam_;
-    Simple_staff* staff_;
+    Simple_staff* staff_l_;
     Text_req *text_;
     
     /****************/

diff --git a/src/request.cc b/src/request.cc
index f87f103a6c285e53445356c735bd722b7275c9d7..8cc3bf149581700abd7b040e2ee03620b482d798 100644 (file)
--- a/src/request.cc
+++ b/src/request.cc
@@ -11,6 +11,7 @@ RCONS(Rest_req);
 RCONS(Barcheck_req);
 RCONS(Text_req);
 RCONS(Rhythmic_req);
+RCONS(Mark_req);
 RCONS(Stem_req);
 RCONS(Script_req);
 RCONS(Note_req);
@@ -18,7 +19,11 @@ RCONS(Melodic_req);
 RCONS(Span_req);
 RCONS(Slur_req);
 RCONS(Beam_req);
-
+void
+Stem_req::print() const
+{
+    mtor << "Stem\n";
+}
 void
 Barcheck_req::print() const    
 {
@@ -80,7 +85,7 @@ Rhythmic_req::print() const
     while (d--)
        mtor << '.';
     
-    mtor<<"xPlet factor"<<plet_factor<<"\n";
+    mtor<<", plet factor"<<plet_factor<<"\n";
 }
 
 void
@@ -168,4 +173,15 @@ Text_req::~Text_req()
     delete spec;
 }
 
+Mark_req::Mark_req(String s)
+{
+    mark_str_ = s;
+}
 
+void
+Mark_req::print()const
+{
+#ifndef NDEBUG
+    mtor<< "Mark `" << mark_str_ << "\'\n";
+#endif
+}

diff --git a/src/stcol.cc b/src/stcol.cc
index 46c04cbeadd944afee5f4118e5be90a0c8552784..9d070aa4cca57d21a414e06672b96f706ac55299 100644 (file)
--- a/src/stcol.cc
+++ b/src/stcol.cc
@@ -12,7 +12,7 @@ Staff_column::OK() const
        assert(tdescription_->when == when());
        assert(*tdescription_ == staff_commands_p_->tdescription_);
     }
-    #endif
+#endif
 }
 
 bool