* scripts/abc2ly.py (dump_slyrics): add ord().

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index a10ba753db70694b2b1b16868253bccb88bef1b8..0d179d75c81eb0e97dc344eb466708b7a8f5e247 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,10 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 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 "warn.hh"
 #include "dimensions.hh"
@@ -23,6 +25,10 @@ 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]->get_column ();
@@ -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_);
+                            item_l_drul_[RIGHT],
+                            distance_);
 }