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

lilypond-0.0.23
---

diff --git a/src/staffelem.cc b/src/staffelem.cc
index d942732e7c..e1b5e4228b 100644
--- a/src/staffelem.cc
+++ b/src/staffelem.cc
@@ -37,24 +37,35 @@ Interval
 Staff_elem::width() const
 {
     Molecule*m= brew_molecule();
-    Interval r = m->extent().x;
-
-    if (!r.empty())		// float exception on DEC Alpha
-	 r+=offset_.x;
+    Interval r;
+
+    if (!output){
+	Molecule*m	= brew_molecule();
+	r = m->extent().x;
+	delete m;
+    } else
+	r = output->extent().x;
+  
+    if (!r.empty()) // float exception on DEC Alpha
+	r+=offset_.x;
 
-    delete m;
     return r;
 }
 Interval
 Staff_elem::height() const
 {
-    Molecule*m= brew_molecule();
-    Interval r = m->extent().y;
+    Interval r;
 
- 
+    if (!output){
+	Molecule*m	= brew_molecule();
+	r = m->extent().y;
+	delete m;
+    } else
+	r = output->extent().y;
+    
     if (!r.empty())
 	r+=offset_.y;
-     delete m;
+
   
     return r;
 }