Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index 181626ef3a88c9933a42f294a407614374185803..b274aab8725d90ab16f73616fdf7e0228e949dfd 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -29,6 +29,8 @@ Rest::y_offset_callback (SCM smob)
 
   Real amount = robust_scm2double (me->get_property ("staff-position"), 0)
     * 0.5 * ss;
+  bool position_override = amount;
+  
   if (line_count % 2)
     {
       if (duration_log == 0 && line_count > 1)
@@ -46,10 +48,11 @@ Rest::y_offset_callback (SCM smob)
   if (dot && duration_log >= -1 && duration_log <= 1) // UGH again.
     {
       dot->set_property ("staff-position",
-                      scm_from_int ((duration_log == 0) ? -1 : 1));
+                        scm_from_int ((duration_log == 0) ? -1 : 1));
     }
 
-  amount += 2 * ss * get_grob_direction (me);; 
+  if (!position_override)
+    amount += 2 * ss * get_grob_direction (me);; 
   
   return scm_from_double (amount);
 }
@@ -57,8 +60,8 @@ Rest::y_offset_callback (SCM smob)
 /*
   make this function easily usable in C++
 */
-std::string
-Rest::glyph_name (Grob *me, int balltype, std::string style, bool try_ledgers)
+string
+Rest::glyph_name (Grob *me, int balltype, string style, bool try_ledgers)
 {
   bool is_ledgered = false;
   if (try_ledgers && (balltype == 0 || balltype == 1))
@@ -75,7 +78,7 @@ Rest::glyph_name (Grob *me, int balltype, std::string style, bool try_ledgers)
       is_ledgered |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad);
     }
 
-  std::string actual_style (style.c_str ());
+  string actual_style (style.c_str ());
 
   if ((style == "mensural") || (style == "neomensural"))
     {
@@ -128,13 +131,13 @@ Rest::brew_internal_stencil (Grob *me, bool ledgered)
 
   int balltype = scm_to_int (balltype_scm);
 
-  std::string style;
+  string style;
   SCM style_scm = me->get_property ("style");
   if (scm_is_symbol (style_scm))
     style = ly_scm2string (scm_symbol_to_string (style_scm));
 
   Font_metric *fm = Font_interface::get_default_font (me);
-  std::string font_char = glyph_name (me, balltype, style, ledgered);
+  string font_char = glyph_name (me, balltype, style, ledgered);
   Stencil out = fm->find_by_name (font_char);
   if (out.is_empty ())
     me->warning (_f ("rest `%s' not found", font_char.c_str ()));