X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=210e756814bbf7c9cdf8c215ac8142db71d60563;hb=05fabaaf86fd44f9bd903f282bb98d343a991e40;hp=6dc7dab8584483e009377c3f8c4cec8764ee4a8d;hpb=b1eda2bf8186760c557b770833c172a8979bc538;p=lilypond.git

diff --git a/lily/rest.cc b/lily/rest.cc
index 6dc7dab858..210e756814 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -1,48 +1,167 @@
 /*
-  rest.cc -- implement 
+ rest.cc -- implement Rest
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 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)
-    position_i_ += 4;
-  else if (balltype_i_ == 1)
-    position_i_ += 4;
-  Rhythmic_head::do_add_processing ();
-  if (dots_l_)
-      dots_l_->position_i_ = position_i_;
+  Grob *me = unsmob_grob (smob);
+  int bt = gh_scm2int (me->get_grob_property ("duration-log"));
+  int lc = Staff_symbol_referencer::line_count (me);
+  Real ss = Staff_symbol_referencer::staff_space (me);
+  if(lc % 2)
+    {
+      if (bt == 0 && lc > 1)
+	{
+	  me->translate_axis (ss , Y_AXIS);
+	}
+    }
+  else
+    {
+      me->translate_axis (ss/2 , Y_AXIS);
+    }
+
+  Grob * d = unsmob_grob (me->get_grob_property ("dot"));
+  if (d && bt > 4) // UGH.
+    {
+      d->set_grob_property ("staff-position",
+			    gh_int2scm ((bt == 7) ? 4 : 3));
+    }
+  if (d && bt >= -1 && bt <= 1) // UGH again.
+    {
+      d->set_grob_property ("staff-position",
+      			    gh_int2scm ((bt == 0) ? -1 : 1));
+    }
+  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 ledgered_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.
+       */
+      ledgered_b |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad);
+      ledgered_b |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad);
+    }
+
+  String actual_style (style.to_str0 ());
+
+  if ((style == "mensural") || (style == "neo_mensural")) {
+
+    /*
+      FIXME: Currently, ancient font does not provide ledgered rests;
+      hence the "o" suffix in the glyph name is bogus.  But do we need
+      ledgered rests at all now that we can draw ledger lines with
+      variable width, length and blotdiameter? -- jr
+    */
+    ledgered_b = 0;
+
+    /*
+      There are no 32th/64th/128th mensural/neo_mensural rests.  In
+      these cases, revert back to default style.
+    */
+    if (balltype > 4)
+      actual_style = "";
+  }
+
+  if ((style == "classical") && (balltype != 2)) {
+    /*
+      classical style: revert back to default style for any rest other
+      than quarter rest
+    */
+    actual_style = "";
+  }
+
+  if (style == "default") {
+    /*
+      Some parts of lily still prefer style "default" over "".
+      Correct this here. -- jr
+    */
+    actual_style = "";
+  }
+
+  return ("rests-") + to_string (balltype) + (ledgered_b ? "o" : "") + actual_style;
 }
 
-Molecule *
-Rest::brew_molecule_p () const
+
+MAKE_SCHEME_CALLBACK (Rest,print,1);
+
+SCM
+Rest::brew_internal_molecule (SCM smob)
 {
-  int staff_size_i_ =8;
-  bool streepjes_b = (position_i_<-1) || (position_i_ > staff_size_i_+1);
-  if  (balltype_i_ < 0 || balltype_i_ > 1)
-    streepjes_b = false;
+  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 (position_i_ *  paper ()->internote_f (), Y_AXIS);
-  return m;
+  String style; 
+  SCM style_scm = me->get_grob_property ("style");
+  if (gh_symbol_p (style_scm))
+    {
+      style = ly_scm2string (scm_symbol_to_string (style_scm));
+    }
+
+  Font_metric *fm = Font_interface::get_default_font (me);
+  String font_char = glyph_name (me, balltype, style);
+  Molecule out = fm->find_by_name (font_char);
+  if (out.is_empty ())
+    {
+      me->warning (_f ("rest `%s' not found, ", font_char.to_str0 ()));
+    }
+
+  return out.smobbed_copy();
+}
+
+SCM 
+Rest::print (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-distance");
 
-IMPLEMENT_IS_TYPE_B1(Rest, Rhythmic_head);