Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index 87548a7056c538bb32867091085c5a2a7cf675cd..aa265f504236aee5c4465eeec693610a247f9add 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -269,18 +269,21 @@ Tie::print (SCM smob)
                      line_thick);
 
 #if DEBUG_TIE_SCORING
-  SCM quant_score = me->get_property ("quant-score");
-
-  if (to_boolean (me->layout ()
-                 ->lookup_variable (ly_symbol2scm ("debug-tie-scoring")))
-      && scm_is_string (quant_score))
+  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;
       SCM properties = Font_interface::text_font_alist_chain (me);
 
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
                                    (me->layout ()->self_scm (), properties,
-                                    quant_score));
+                                    annotation));
       tm.translate (Offset (b.control_[3][X_AXIS] + 0.5,
                            b.control_[0][Y_AXIS] * 2));
       tm = tm.in_color (1, 0, 0);
@@ -297,11 +300,10 @@ Tie::print (SCM smob)
 }
 
 ADD_INTERFACE (Tie,
-              "A horizontal curve connecting two noteheads. \n\n"
-              ,
+              "A horizontal curve connecting two noteheads.",
               
-
               /* properties */
+              "annotation "
               "avoid-slur "    //  UGH.
               "control-points "
               "dash-fraction "
@@ -310,11 +312,10 @@ ADD_INTERFACE (Tie,
               "direction "
               "separation-item "
               "head-direction "
-              "line-thickness " 
+              "line-thickness "
               "quant-score "
               "staff-position "
               "thickness "
-
               );