fix footer position in generated html files

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index e3c4ca2521aa0ae23490e334eb239ccfb34bc0a1..16b63bef8dd9d51014a74e2eea969b74b620326e 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -115,6 +115,11 @@ Slur::print (SCM smob)
       string str;
       SCM properties = Font_interface::text_font_alist_chain (me);
 
+
+      if (!scm_is_number (me->get_property ("font-size")))
+       properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL),
+                            properties);
+      
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
                                    (me->layout ()->self_scm (), properties,
                                     quant_score));
@@ -208,7 +213,6 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
            : ((fabs (bezext[RIGHT] - x) < EPS)
               ? curve.control_[3][Y_AXIS]
               : curve.get_other_coordinate (X_AXIS, x));
-         consider[k] = true;
 
          /* Request shift if slur is contained script's Y, or if
             script is inside slur and avoid == outside.  */
@@ -219,13 +223,11 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
     }
 
   Real avoidance_offset = 0.0;
-  if (do_shift)
-    {
-      for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
-       avoidance_offset = dir * (max (dir * avoidance_offset,
-                            dir * (ys[k] - yext[-dir] + dir * slur_padding)));
-    }
-
+  for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
+    if (consider[k]) 
+      avoidance_offset = dir * (max (dir * avoidance_offset,
+                                    dir * (ys[k] - yext[-dir] + dir * slur_padding)));
+  
   return scm_from_double (scm_to_double (offset_scm) + avoidance_offset);
 }
 
@@ -236,17 +238,21 @@ ADD_INTERFACE (Slur, "slur-interface",
               "A slur",
               
               /* properties */
+              "avoid-slur "    /* UGH. */
               "control-points "
               "dash-fraction "
               "dash-period "
+              "details "
               "direction "
               "eccentricity "
               "encompass-objects "
               "height-limit "
+              "line-thickness "
               "note-columns "
               "positions "
               "quant-score "
               "ratio "
-              "details "
-              "thickness ");
+              "thickness "
+
+              );