2003 -> 2004

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index 4f135a31caedf8b216dad16dabf3f3b440c3410d..ea369d6a646e6b0744916abcbd05adf88d9b6d10 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
@@ -41,7 +41,11 @@ Rest::after_line_breaking (SCM smob)
       d->set_grob_property ("staff-position",
                            gh_int2scm ((bt == 7) ? 4 : 3));
     }
-
+  if (d && bt >= -1 && bt <= 1) // UGH again.
+    {
+      d->set_grob_property ("staff-position",
+                           gh_int2scm ((bt == 0) ? -1 : 1));
+    }
   return SCM_UNSPECIFIED;
 }
 
@@ -130,7 +134,7 @@ Rest::brew_internal_molecule (SCM smob)
   Font_metric *fm = Font_interface::get_default_font (me);
   String font_char = glyph_name (me, balltype, style);
   Molecule out = fm->find_by_name (font_char);
-  if (out.empty_b())
+  if (out.is_empty ())
     {
       me->warning (_f ("rest `%s' not found, ", font_char.to_str0 ()));
     }
@@ -159,5 +163,5 @@ Rest::extent_callback (SCM smob, SCM ax)
 
 ADD_INTERFACE (Rest,"rest-interface",
   "a rest",
-  "style minimum-beam-collision-distance");
+  "style minimum-distance");