* lily/include/main.hh: rename format to backend.

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index 7fcfcbc52d6dbb997a61aaa4b85310db45c2d1e0..88baddb71e9bba8ff90389b1c77fbb617b459e5e 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,19 +3,21 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+
 #include "rod.hh"
+
 #include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "dimensions.hh"
 #include "spaceable-grob.hh"
 
 Rod::Rod ()
 {
-  distance_f_ = 0.0;
-  item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
+  distance_ = 0.0;
+  item_l_drul_[LEFT] = item_l_drul_[RIGHT] = 0;
 }
 
 
@@ -23,12 +25,16 @@ Rod::Rod ()
 void
 Rod::columnize ()
 {
+  if (!item_l_drul_[LEFT]
+      || !item_l_drul_[RIGHT])
+    return ;
+  
   Direction d = LEFT;
   do {
-    Paper_column * pc = item_l_drul_[d]->column_l ();
-    distance_f_ += - d * item_l_drul_[d]->relative_coordinate (pc, X_AXIS);
+    Paper_column * pc = item_l_drul_[d]->get_column ();
+    distance_ += - d * item_l_drul_[d]->relative_coordinate (pc, X_AXIS);
     item_l_drul_[d] = pc;
-  } while ((flip (&d))!=LEFT);
+  } while ((flip (&d))!= LEFT);
 
 }
 
@@ -36,9 +42,10 @@ void
 Rod::add_to_cols ()
 {
   columnize ();
-  if (item_l_drul_[LEFT] != item_l_drul_[RIGHT])
+  if (item_l_drul_[LEFT] != item_l_drul_[RIGHT]
+      && item_l_drul_[LEFT] && item_l_drul_[RIGHT])
     Spaceable_grob::add_rod (item_l_drul_[LEFT],
-                               item_l_drul_[RIGHT],
-                               distance_f_);
+                            item_l_drul_[RIGHT],
+                            distance_);
 }