X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frod.cc;h=be04a669ab728b1354376aa2ab420c84e3ab0ae8;hb=refs%2Fheads%2Fbugs%2F572290;hp=932133f33918cc0e5b1f1782a4fd5eaacc910ddc;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/rod.cc b/lily/rod.cc
index 932133f339..be04a669ab 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -1,44 +1,49 @@
-/*   
-  rod.cc --  implement Rod, Column_rod
-  
+/*
+  rod.cc -- implement Rod, Column_rod
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "rod.hh"
+
 #include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "dimensions.hh"
-#include "spaceable-element.hh"
+#include "spaceable-grob.hh"
 
 Rod::Rod ()
 {
-  distance_f_ = 0.0;
-  item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
+  distance_ = 0.0;
+  item_drul_[LEFT] = item_drul_[RIGHT] = 0;
 }
 
-
-
 void
 Rod::columnize ()
 {
-  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);
-    item_l_drul_[d] = pc;
-  } while ((flip (&d))!=LEFT);
+  if (!item_drul_[LEFT]
+      || !item_drul_[RIGHT])
+    return;
 
+  Direction d = LEFT;
+  do
+    {
+      Paper_column *pc = item_drul_[d]->get_column ();
+      distance_ += -d * item_drul_[d]->relative_coordinate (pc, X_AXIS);
+      item_drul_[d] = pc;
+    }
+  while ((flip (&d)) != LEFT);
 }
 
 void
 Rod::add_to_cols ()
 {
   columnize ();
-  if (item_l_drul_[LEFT] != item_l_drul_[RIGHT])
-    Spaceable_grob::add_rod (item_l_drul_[LEFT],
-				item_l_drul_[RIGHT],
-				distance_f_);
+  if (item_drul_[LEFT] != item_drul_[RIGHT]
+      && item_drul_[LEFT] && item_drul_[RIGHT])
+    Spaceable_grob::add_rod (item_drul_[LEFT],
+			     item_drul_[RIGHT],
+			     distance_);
 }