From: fred <fred>
Date: Sun, 24 Mar 2002 19:28:13 +0000 (+0000)
Subject: lilypond-0.0.23
X-Git-Tag: release/1.5.59~5593
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=87a79ea87d9f5d5f478255763e6182de5e5bd0d8;p=lilypond.git

lilypond-0.0.23
---

diff --git a/Initial.make b/Initial.make
new file mode 100644
index 0000000000..1c2d8abb10
--- /dev/null
+++ b/Initial.make
@@ -0,0 +1,12 @@
+include Variables.make
+
+initdefault: $(CCDIR)/parser.cc $(CCDIR)/lexer.cc hdr/version.hh alldeps
+
+include Generate.make
+
+alldeps: #$(ALLDEPS)
+	touch $(DEPDIR)/dummy.dep
+
+$(DEPDIR)/%.dep:  $(CCDIR)/%.cc
+	$(DODEP) $(CXX) -E  $(CXXFLAGS) $^ > /dev/null
+
diff --git a/src/simpleprint.cc b/src/simpleprint.cc
index de3d6ec921..e5b992ec3f 100644
--- a/src/simpleprint.cc
+++ b/src/simpleprint.cc
@@ -49,13 +49,13 @@ Simple_column::typeset_item(Item *i, int breakst)
 {
     assert(i);
     
-    staff_->pscore_l_->typeset_item(i, score_column_l_->pcol_l_,
-				  staff_->theline,breakst);
+    staff_l_->pscore_l_->typeset_item(i, score_column_l_->pcol_l_,
+				  staff_l_->theline,breakst);
     
     if (breakst == BREAK_PRE - BREAK_PRE) {
 	
         Array<Item*> to_move(
-	    staff_->pscore_l_->select_items(staff_->theline,
+	    staff_l_->pscore_l_->select_items(staff_l_->theline,
 					  score_column_l_->pcol_l_->prebreak_p_));
 	Interval column_wid = itemlist_width(to_move);
 	assert(!column_wid.empty());
@@ -67,7 +67,7 @@ Simple_column::typeset_item(Item *i, int breakst)
 }    
 
 void
-Simple_column::typeset_item_directional(Item *i, int dir, int breakst)
+Simple_column::typeset_item_directional(Item *i, int dir, int breakst) // UGH!
 {
     assert(i);
     PCol * c=score_column_l_->pcol_l_;
@@ -76,7 +76,7 @@ Simple_column::typeset_item_directional(Item *i, int dir, int breakst)
     else if (breakst == 2)
 	c = c->postbreak_p_;
     
-    Array<Item*> to_move(staff_->pscore_l_->select_items(staff_->theline,
+    Array<Item*> to_move(staff_l_->pscore_l_->select_items(staff_l_->theline,
 						      c));    
     typeset_item(i, breakst);