From: fred <fred>
Date: Tue, 26 Mar 2002 21:47:27 +0000 (+0000)
Subject: lilypond-1.1.33
X-Git-Tag: release/1.5.59~2569
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=61fad9b2ed3cd220684fee3cbb3bc193b54c03f3;p=lilypond.git

lilypond-1.1.33
---

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index b675686929..2682d500a0 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -17,9 +17,9 @@ class Multi_measure_rest : public Spanner
 public:
   Multi_measure_rest ();
   int measures_i_;
-  void add_column (Bar*);
+  void add_column (Item*);
 
-  Link_array<Bar> column_arr_;
+  Link_array<Item> column_arr_;
 
 protected:
   virtual Molecule *do_brew_molecule_p () const;
@@ -28,6 +28,7 @@ protected:
   virtual void do_add_processing ();
   virtual void do_post_processing ();
   virtual void do_print () const;
+  virtual Array<Rod> get_rods () const;
   virtual void do_substitute_element_pointer (Score_element*,Score_element*);
 };
 
diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 5776a95fcc..4c23334b7d 100644
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -95,14 +95,25 @@ Multi_measure_rest::do_post_processing ()
 void
 Multi_measure_rest::do_substitute_element_pointer (Score_element* o, Score_element* n)
 {
-  if (Bar* c = dynamic_cast <Bar*> (o))
-    column_arr_.substitute (c, dynamic_cast<Bar*> (n));
+  if (Item* c = dynamic_cast <Item*> (o))
+    column_arr_.substitute (c, dynamic_cast<Item*> (n));
 }
   
 void
-Multi_measure_rest::add_column (Bar* c)
+Multi_measure_rest::add_column (Item* c)
 {
   column_arr_.push (c);
   add_dependency (c);
 }
 
+
+Array<Rod>
+Multi_measure_rest::get_rods () const
+{
+  Array<Rod> a;
+  Rod r;
+  r.item_l_drul_ = spanned_drul_;
+  r.distance_f_ = paper ()->get_var ("mmrest_x_minimum");
+  a.push (r);
+  return a;
+}