* The grand 2005-2006 replace.

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index 0645fe1bbaa0eccaf4eef9d635c26fe4a2a6668b..552f881109c88135763ae36b35cef98bf6990b59 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rest.hh"
@@ -17,37 +17,39 @@
 #include "directional-element-interface.hh"
 
 // -> offset callback
-MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 2);
+MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1);
 SCM
-Rest::y_offset_callback (SCM smob, SCM axis)
+Rest::y_offset_callback (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  (void) axis;
-  
-  int bt = scm_to_int (me->get_property ("duration-log"));
-  int lc = Staff_symbol_referencer::line_count (me);
+  int duration_log = scm_to_int (me->get_property ("duration-log"));
+  int line_count = Staff_symbol_referencer::line_count (me);
   Real ss = Staff_symbol_referencer::staff_space (me);
 
-  Real amount = 0.0;
-  if (lc % 2)
+  Real amount = robust_scm2double (me->get_property ("staff-position"), 0)
+    * 0.5 * ss;
+  if (line_count % 2)
     {
-      if (bt == 0 && lc > 1)
+      if (duration_log == 0 && line_count > 1)
        amount += ss;
     }
   else
     amount += ss / 2;
 
-  Grob *d = unsmob_grob (me->get_object ("dot"));
-  if (d && bt > 4) // UGH.
+  Grob *dot = unsmob_grob (me->get_object ("dot"));
+  if (dot && duration_log > 4) // UGH.
     {
-      d->set_property ("staff-position",
-                      scm_from_int ((bt == 7) ? 4 : 3));
+      dot->set_property ("staff-position",
+                      scm_from_int ((duration_log == 7) ? 4 : 3));
     }
-  if (d && bt >= -1 && bt <= 1) // UGH again.
+  if (dot && duration_log >= -1 && duration_log <= 1) // UGH again.
     {
-      d->set_property ("staff-position",
-                      scm_from_int ((bt == 0) ? -1 : 1));
+      dot->set_property ("staff-position",
+                      scm_from_int ((duration_log == 0) ? -1 : 1));
     }
+
+  amount += 2 * ss * get_grob_direction (me);; 
+  
   return scm_from_double (amount);
 }
 
@@ -57,7 +59,7 @@ Rest::y_offset_callback (SCM smob, SCM axis)
 String
 Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
 {
-  bool ledgered_b = false;
+  bool is_ledgered = false;
   if (try_ledgers && (balltype == 0 || balltype == 1))
     {
       Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0;
@@ -68,8 +70,8 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
        could bemore generic, but hey, we understand this even after
        dinner.
       */
-      ledgered_b |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad);
-      ledgered_b |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad);
+      is_ledgered |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad);
+      is_ledgered |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad);
     }
 
   String actual_style (style.to_str0 ());
@@ -83,7 +85,7 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
        ledgered rests at all now that we can draw ledger lines with
        variable width, length and blotdiameter? -- jr
       */
-      ledgered_b = 0;
+      is_ledgered = 0;
 
       /*
        There are no 32th/64th/128th mensural/neomensural rests.  In
@@ -111,7 +113,7 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
       actual_style = "";
     }
 
-  return ("rests." + to_string (balltype) + (ledgered_b ? "o" : "")
+  return ("rests." + to_string (balltype) + (is_ledgered ? "o" : "")
          + actual_style);
 }
 
@@ -159,7 +161,7 @@ MAKE_SCHEME_CALLBACK (Rest, height, 1);
 SCM
 Rest::height (SCM smob)
 {
-  return  generic_extent_callback (unsmob_grob (smob), Y_AXIS);
+  return generic_extent_callback (unsmob_grob (smob), Y_AXIS);
 }
 
 /*
@@ -180,23 +182,12 @@ Rest::generic_extent_callback (Grob *me, Axis a)
   return ly_interval2scm (unsmob_stencil (m)->extent (a));
 }
 
-MAKE_SCHEME_CALLBACK (Rest, polyphonic_offset_callback, 2);
-SCM
-Rest::polyphonic_offset_callback (SCM smob, SCM)
-{
-  Grob *me = unsmob_grob (smob);
-  if (scm_is_number (me->get_property ("staff-position")))
-    return scm_from_double (0);
-
-  Direction d = get_grob_direction (me);
-  Real off = 2 * d;
-  if (off)
-    off *= Staff_symbol_referencer::staff_space (me);
-
-  return scm_from_double (off);
-}
-
 ADD_INTERFACE (Rest, "rest-interface",
               "A rest symbol.",
-              "style direction minimum-distance");
+
+              /* properties */
+                 
+              "style "
+              "direction "
+              "minimum-distance");