X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=7375e107f5f4e195ba9301f0d3102a44929c5776;hb=38269bfebef7893a1bd82fd2182155f77a59e5a7;hp=0028373cf5dfdd9ce5331ccc0d439ae9e78adff6;hpb=65a284d681d8a099efb60be7a938a7f98d58cc73;p=lilypond.git

diff --git a/lily/rest.cc b/lily/rest.cc
index 0028373cf5..7375e107f5 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -1,50 +1,123 @@
 /*
-  rest.cc -- implement Rest
+ rest.cc -- implement Rest
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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 "p-score.hh"
+#include "paper-score.hh"
+#include "staff-symbol-referencer.hh"
 
-void
-Rest::do_add_processing ()
+// -> offset callback
+MAKE_SCHEME_CALLBACK (Rest,after_line_breaking,1);
+SCM
+Rest::after_line_breaking (SCM smob)
 {
-  if (balltype_i_ != 0 && balltype_i_ != 1)
-    position_i_ -= 4;
-  else if (balltype_i_ == 0)
-    position_i_ += 2;
+  Grob *me = unsmob_grob (smob);
+  int bt = gh_scm2int (me->get_grob_property ("duration-log"));
+  if (bt == 0 && Staff_symbol_referencer::line_count (me) > 1)
+    {
+      me->translate_axis (Staff_symbol_referencer::staff_space (me) , Y_AXIS);
+    }
 
-  Rhythmic_head::do_add_processing ();
-  if (dots_l_ && balltype_i_ > 1)
+  Grob * d = unsmob_grob (me->get_grob_property ("dot"));
+  if (d && bt > 4) // UGH.
     {
-      dots_l_->position_i_ = position_i_ + 4;
+      d->set_grob_property ("staff-position",
+			    gh_int2scm ((bt == 7) ? 4 : 3));
     }
+
+  return SCM_UNSPECIFIED;
 }
 
-Rest::Rest ()
+/*
+  make this function easily usable in C++
+ */
+
+String
+Rest::glyph_name (Grob * me, int balltype, String style)
 {
-  position_i_ =0;
+  bool ledger_b =false;
+
+  if (balltype == 0 || balltype == 1)
+    {
+      Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0;
+      Real pos = Staff_symbol_referencer::get_position (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_string (balltype)
+    + (ledger_b ? "o" : "") + style;
 }
 
-Molecule *
-Rest::brew_molecule_p () const
+
+
+
+MAKE_SCHEME_CALLBACK (Rest,brew_molecule,1);
+
+SCM
+Rest::brew_internal_molecule (SCM smob)
 {
-  int staff_size_i_ = 8;
-  bool streepjes_b = abs(position_i_) > staff_size_i_ /2 &&  
-    (balltype_i_ == 0 || balltype_i_ == 1);
+  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);
   
-  Atom s(paper ()->lookup_l()->rest (balltype_i_, streepjes_b));
-  Molecule * m = new Molecule ( Atom (s));
-  m->translate_axis (position_i_ *  paper ()->internote_f (), Y_AXIS);
-  return m;
+  String style; 
+  SCM style_sym =me->get_grob_property ("style");
+  if (gh_symbol_p (style_sym))
+    {
+      style = ly_scm2string (scm_symbol_to_string (style_sym));
+    }
+
+  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();
+  }
+}
+
+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));
 }
 
-IMPLEMENT_IS_TYPE_B1(Rest, Rhythmic_head);
+
+
+ADD_INTERFACE (Rest,"rest-interface",
+  "a rest",
+  "style minimum-beam-collision-distance");
+