release: 1.5.9

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index 1ca731b20f751022300ea06a0b231c062a07138c..c29f77765268248cc68ae6090fe12e509c925dfa 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,73 +3,113 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 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 "paper-score.hh"
 #include "staff-symbol-referencer.hh"
 
 // -> offset callback
-MAKE_SCHEME_CALLBACK(Rest,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Rest,after_line_breaking,1);
 SCM
 Rest::after_line_breaking (SCM smob)
 {
-  Score_element *me = unsmob_element (smob);
-  int bt = gh_scm2int (me->get_elt_property ("duration-log"));
+  Grob *me = unsmob_grob (smob);
+  int bt = gh_scm2int (me->get_grob_property ("duration-log"));
   if (bt == 0)
     {
       me->translate_axis (Staff_symbol_referencer::staff_space (me) , Y_AXIS);
     }
 
-  Score_element * d = unsmob_element (me->get_elt_property ("dot"));
+  Grob * d = unsmob_grob (me->get_grob_property ("dot"));
   if (d && bt > 4) // UGH.
     {
-      d->set_elt_property ("staff-position",
-                          gh_int2scm ((bt == 7) ? 4 : 3));
+      d->set_grob_property ("staff-position",
+                           gh_int2scm ((bt == 7) ? 4 : 3));
     }
 
   return SCM_UNSPECIFIED;
 }
 
+/*
+  make this function easily usable in C++
+ */
 
-MAKE_SCHEME_CALLBACK(Rest,brew_molecule,1)
-SCM 
-Rest::brew_molecule (SCM smob) 
+String
+Rest::glyph_name (Grob * me, int balltype, String style)
 {
-  Score_element* me = unsmob_element (smob);
-  
   bool ledger_b =false;
 
-  SCM balltype = me->get_elt_property ("duration-log");
-  
-  if (balltype == gh_int2scm (0) || balltype == gh_int2scm (1))
+  if (balltype == 0 || balltype == 1)
     {
-      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;
+      Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0;
+      Real pos = Staff_symbol_referencer::position_f (me);
+
+      /*
+       Figure out when the rest is far enough outside the staff. This
+       could bemore generic, but hey, we understand this even after
+       dinner.
+       
+       */
+      ledger_b = ledger_b || (balltype == 0 && (pos >= rad +2   || pos < -rad ));
+      ledger_b = ledger_b || (balltype == 1 &&
+                             (pos  <= -rad -2 || pos > rad));
     }
   
+  return ("rests-") + to_str (balltype)
+    + (ledger_b ? "o" : "") + style;
+}
+
+
+
+
+MAKE_SCHEME_CALLBACK (Rest,brew_molecule,1);
+
+SCM
+Rest::brew_internal_molecule (SCM smob)
+{
+  Grob* me = unsmob_grob (smob);
+
+  SCM balltype_scm = me->get_grob_property ("duration-log");
+  if (!gh_number_p (balltype_scm))
+    return Molecule ().smobbed_copy ();
+  int balltype = gh_scm2int (balltype_scm);
+  
   String style; 
-  SCM style_sym =me->get_elt_property ("style");
-  if (gh_scm2int (balltype) >= 2 && gh_string_p (style_sym))
+  SCM style_sym =me->get_grob_property ("style");
+  if (gh_symbol_p (style_sym))
     {
-      style = ly_scm2string (style_sym);
+      style = ly_scm2string (scm_symbol_to_string (style_sym));
     }
 
-  String idx =  ("rests-") + to_str (gh_scm2int (balltype))
-    + (ledger_b ? "o" : "") + style;
-
-  return me-> lookup_l ()->afm_find (idx).create_scheme();
+  String idx = glyph_name (me, balltype, style);
+  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 (Score_element*m)
+Rest::has_interface (Grob*m)
 {
   return m && m->has_interface (ly_symbol2scm ("rest-interface"));
 }