Doc-hu: trying to build PDF

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index 563e2ca938873c06e4876586552f81112f2cd207..e8b21d8544bad329473b39445c5e80dadb973cf5 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -74,12 +74,18 @@ Tie::head (Grob *me, Direction d)
 int
 Tie::get_column_rank (Grob *me, Direction d)
 {
+  Grob *col = 0;
   Spanner *span = dynamic_cast<Spanner *> (me);
-  Grob *h = head (me, d);
-  if (!h)
-    h = span->get_bound (d);
+  if (!span)
+    col = dynamic_cast<Item *> (me)->get_column ();
+  else
+    {
+      Grob *h = head (me, d);
+      if (!h)
+        h = span->get_bound (d);
 
-  Grob *col = dynamic_cast<Item *> (h)->get_column ();
+      col = dynamic_cast<Item *> (h)->get_column ();
+    }
   return Paper_column::get_rank (col);
 }
 
@@ -275,12 +281,6 @@ Tie::print (SCM smob)
 
 #if DEBUG_TIE_SCORING
   SCM annotation = me->get_property ("annotation");
-  if (!scm_is_string (annotation))
-    {
-      SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-tie-scoring"));
-      if (to_boolean (debug))
-       annotation = me->get_property ("quant-score");
-    }
   if (scm_is_string (annotation))
     {
       string str;
@@ -317,7 +317,6 @@ ADD_INTERFACE (Tie,
               "head-direction "
               "line-thickness "
               "neutral-direction "
-              "quant-score "
               "staff-position "
               "thickness "
               );