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 552f881109c88135763ae36b35cef98bf6990b59..b274aab8725d90ab16f73616fdf7e0228e949dfd 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -8,13 +8,14 @@
 
 #include "rest.hh"
 
-#include "stencil.hh"
-#include "output-def.hh"
-#include "font-interface.hh"
+#include "directional-element-interface.hh"
 #include "dots.hh"
+#include "font-interface.hh"
+#include "international.hh"
+#include "output-def.hh"
 #include "paper-score.hh"
 #include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
+#include "stencil.hh"
 
 // -> offset callback
 MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1);
@@ -28,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)
@@ -45,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);
 }
@@ -56,8 +60,8 @@ Rest::y_offset_callback (SCM smob)
 /*
   make this function easily usable in C++
 */
-String
-Rest::glyph_name (Grob *me, int balltype, 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))
@@ -74,7 +78,7 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
       is_ledgered |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad);
     }
 
-  String actual_style (style.to_str0 ());
+  string actual_style (style.c_str ());
 
   if ((style == "mensural") || (style == "neomensural"))
     {
@@ -127,16 +131,16 @@ Rest::brew_internal_stencil (Grob *me, bool ledgered)
 
   int balltype = scm_to_int (balltype_scm);
 
-  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);
-  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.to_str0 ()));
+    me->warning (_f ("rest `%s' not found", font_char.c_str ()));
 
   return out.smobbed_copy ();
 }