X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=149c45ba76f44fb908ef8c0db1076c8d0730c4bd;hb=4b40ecf0af9b4ff3fcf4287ae685ac1a9cc89523;hp=57c5816892073562d2c16b80ccf5d433d786755e;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git

diff --git a/lily/rest.cc b/lily/rest.cc
index 57c5816892..149c45ba76 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,63 +3,90 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 #include "rest.hh"
 #include "dots.hh"
-#include "axis-group-element.hh"
 #include "paper-score.hh"
 #include "staff-symbol-referencer.hh"
 
-
-void
-Rest::do_post_processing ()
+// -> offset callback
+MAKE_SCHEME_CALLBACK(Rest,after_line_breaking,1);
+SCM
+Rest::after_line_breaking (SCM smob)
 {
-  if (balltype_i () == 0)
+  Grob *me = unsmob_grob (smob);
+  int bt = gh_scm2int (me->get_grob_property ("duration-log"));
+  if (bt == 0)
     {
-      Staff_symbol_referencer_interface si (this);
-      si.set_position (si.position_f () + 2);
+      me->translate_axis (Staff_symbol_referencer::staff_space (me) , Y_AXIS);
     }
-  
-  Dots * d = dots_l ();
-  if (d && balltype_i () > 4) // UGH.
+
+  Grob * d = unsmob_grob (me->get_grob_property ("dot"));
+  if (d && bt > 4) // UGH.
     {
-      /*
-	UGH. 
-       */
-      staff_symbol_referencer_interface (d)
-	.set_position ((balltype_i () == 7) ? 4 : 3);
+      d->set_grob_property ("staff-position",
+			   gh_int2scm ((bt == 7) ? 4 : 3));
     }
+
+  return SCM_UNSPECIFIED;
 }
 
 
-Molecule *
-Rest::do_brew_molecule_p () const
+MAKE_SCHEME_CALLBACK(Rest,brew_molecule,1);
+
+SCM
+Rest::brew_internal_molecule (SCM smob)
 {
+  Grob* me = unsmob_grob (smob);
+  
   bool ledger_b =false;
 
-  if (balltype_i () == 0 || balltype_i () == 1)
+  SCM balltype = me->get_grob_property ("duration-log");
+  
+  if (balltype == gh_int2scm (0) || balltype == gh_int2scm (1))
     {
-      Staff_symbol_referencer_interface si(this);
-      ledger_b = abs(si.position_f ()  - (2* balltype_i () - 1))
-	> si.line_count (); 
+      int sz = Staff_symbol_referencer::line_count (me);
+      Real dif = abs(Staff_symbol_referencer::position_f (me)  - (2* gh_scm2int (balltype) - 1)); 
+      ledger_b = dif > sz;
     }
   
   String style; 
-  SCM style_sym =get_elt_property ("style");
-  if (balltype_i () >= 2 &&gh_string_p ( style_sym))
+  SCM style_sym =me->get_grob_property ("style");
+  if (gh_scm2int (balltype) >= 2 && gh_symbol_p (style_sym))
     {
-      style = ly_scm2string (style_sym);
+      style = ly_scm2string (scm_symbol_to_string (style_sym));
     }
 
-  String idx =  ("rests-") + to_str (balltype_i ()) + (ledger_b ? "o" : "") + style;
+  String idx =  ("rests-") + to_str (gh_scm2int (balltype))
+    + (ledger_b ? "o" : "") + style;
 
-  return new Molecule(lookup_l ()->afm_find (idx));
+  return Font_interface::get_default_font (me)->find_by_name (idx).smobbed_copy();
 }
 
+SCM 
+Rest::brew_molecule (SCM smob) 
+{
+  return brew_internal_molecule (smob);
+}
+MAKE_SCHEME_CALLBACK(Rest,extent_callback,2);
+/*
+  We need the callback. The real molecule has ledgers depending on
+  Y-position. The Y-position is known only after line breaking.  */
+SCM
+Rest::extent_callback (SCM smob, SCM ax)
+{
+  Axis a = (Axis) gh_scm2int (ax);
+  SCM m = brew_internal_molecule (smob);
+  return ly_interval2scm (unsmob_molecule (m)->extent (a));
+}
 
-
+bool
+Rest::has_interface (Grob*m)
+{
+  return m && m->has_interface (ly_symbol2scm ("rest-interface"));
+}