X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=efd28765da05a8ba7309af819e72a78e0ab5cdb6;hb=3b963e7de14816666287b7a2bcfd35eccef977c4;hp=783372390c783e7a0886d4189fef4feec0dc17ac;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/lily/rest.cc b/lily/rest.cc
index 783372390c..efd28765da 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,63 +3,121 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 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 (d)
-	.set_position ((balltype_i () == 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++
+ */
 
-Molecule 
-Rest::do_brew_molecule () const
+String
+Rest::glyph_name (Grob * me, int balltype, String style)
 {
   bool ledger_b =false;
 
-  if (balltype_i () == 0 || balltype_i () == 1)
+  if (balltype == 0 || balltype == 1)
     {
-      Staff_symbol_referencer_interface si(this);
-      ledger_b = abs(si.position_f ()  - (2* balltype_i () - 1))
-	> si.line_count (); 
+      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 =get_elt_property ("style");
-  if (balltype_i () >= 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 (balltype_i ()) + (ledger_b ? "o" : "") + style;
+  for(;;) {
+    String idx = glyph_name (me, balltype, style);
+    Molecule res = Font_interface::get_default_font (me)->find_by_name (idx);
+    if(res.empty_b() && style!="")
+      style="";
+    else	      
+      return res.smobbed_copy();
+  }
+}
 
-  return lookup_l ()->afm_find (idx);
+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));
 }
 
 
 
+ADD_INTERFACE (Rest,"rest-interface",
+  "a rest",
+  "style minimum-beam-collision-distance");
+