From: fred <fred>
Date: Sun, 24 Mar 2002 19:45:54 +0000 (+0000)
Subject: lilypond-0.0.70pre
X-Git-Tag: release/1.5.59~4580
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=433122067694af5699379a11c07d79fe2bd79644;p=lilypond.git

lilypond-0.0.70pre
---

diff --git a/bin/conflily b/bin/conflily
new file mode 100644
index 0000000000..53c6cf6580
--- /dev/null
+++ b/bin/conflily
@@ -0,0 +1,28 @@
+#!/bin/bash
+# conflily
+# ugh: must be executed from lilypond-x.x.x (bin/conflily)
+
+root=$HOME
+lelie=music/lily
+
+if [ ! -e $root/lelie ]
+then
+	echo ln -s $root/$lelie/current $root/lelie
+	ln -s $root/$lelie/current $root/lelie
+fi
+
+rm $root/$lelie/current >& /dev/null
+current=`basename \`pwd\``
+echo ln -s $root/$lelie/$current $root/$lelie/current
+ln -s $root/$lelie/$current $root/$lelie/current
+
+ln -sf $root/lelie/lily/out/lilypond bin/lilypond
+ln -sf $root/lelie/mi2mu/out/mi2mu bin/mi2mu
+
+if [ "x$LILYINCLUDE" = "x" ]
+then
+	export LILYINCLUDE=$root/lelie/init
+fi
+
+configure --prefix=$root --enable-debugging --enable-printing --enable-checking
+
diff --git a/lily/rest-column.cc b/lily/rest-column.cc
index 39cd296b85..219b83307b 100644
--- a/lily/rest-column.cc
+++ b/lily/rest-column.cc
@@ -6,10 +6,21 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include "debug.hh"
 #include "rest-column.hh"
 #include "note-head.hh"
 #include "rest-column.hh"
+#include "stem.hh"
 
+IMPLEMENT_STATIC_NAME(Rest_column);
+IMPLEMENT_IS_TYPE_B1(Rest_column,Item);
+
+Rest_column::Rest_column()
+{
+    dir_i_ = 0;
+    stem_l_ = 0;
+}
+    
 void
 Rest_column::add(Note_head *n_l)
 {
@@ -18,27 +29,39 @@ Rest_column::add(Note_head *n_l)
 }
 
 void
-Rest_column::translate_y(Real dy_f)
+Rest_column::add(Stem*stem_l)
 {
-    for (int i=0; i < head_l_arr_.size(); i++)
-	head_l_arr_[i]->translate_y(dy_f);
+    stem_l_ = stem_l;
+    add_dependency(stem_l);
+//    add_support(stem_l);
 }
 
-IMPLEMENT_STATIC_NAME(Rest_column);
-IMPLEMENT_IS_TYPE_B1(Rest_column,Item);
-
-Rest_column::Rest_column()
+void
+Rest_column::do_print() const
 {
-    dir_i_ = 0;
+#ifndef NPRINT
+    mtor << "heads: " << head_l_arr_.size();
+#endif
 }
-    
 
 void
 Rest_column::do_substitute_dependency(Score_elem*o,Score_elem*n)
 {
     Script_column::do_substitute_dependency(o,n);
-    if (o->name() == Note_head::static_name()) {
+    if (o == stem_l_)
+	stem_l_ = n? (Stem*)n->item() :0;
+    
+    if (o->is_type_b( Note_head::static_name()) ) 
 	head_l_arr_.substitute( (Note_head*)o->item(), 
 				(n)? (Note_head*)n->item() : 0);
-    }
+}
+
+/*
+  Are you sure. Horizontal_vertical_group_item::translate_y could handle this
+ */
+void
+Rest_column::translate_y(Real dy_f)
+{
+    for (int i=0; i < head_l_arr_.size(); i++)
+	head_l_arr_[i]->translate_y(dy_f);
 }