*** empty log message ***

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index 63b8e55d54745b49e16565a2f2a44727ca7b8cbb..e36525262bac19a1aea33a3a3ce7b82a529dfbec 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -1,64 +1,60 @@
 /*
 /*

- rest.cc -- implement Rest
+  rest.cc -- implement Rest

 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>

 */
 
 */
 

+#include "rest.hh"
+

 #include "stencil.hh"
 #include "output-def.hh"
 #include "font-interface.hh"
 #include "stencil.hh"
 #include "output-def.hh"
 #include "font-interface.hh"

-#include "rest.hh"

 #include "dots.hh"
 #include "paper-score.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
 // -> offset callback
 #include "dots.hh"
 #include "paper-score.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.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)
 {
   Grob *me = unsmob_grob (smob);
 SCM
 Rest::after_line_breaking (SCM smob)
 {
   Grob *me = unsmob_grob (smob);

-  int bt = ly_scm2int (me->get_property ("duration-log"));
+  int bt = scm_to_int (me->get_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)
   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);
-       }
+       me->translate_axis (ss, Y_AXIS);

     }
   else
     }
   else

-    {
-      me->translate_axis (ss/2 , Y_AXIS);
-    }
+    me->translate_axis (ss / 2, Y_AXIS);

 
 

-  Grob * d = unsmob_grob (me->get_property ("dot"));
+  Grob *d = unsmob_grob (me->get_object ("dot"));

   if (d && bt > 4) // UGH.
     {
       d->set_property ("staff-position",
   if (d && bt > 4) // UGH.
     {
       d->set_property ("staff-position",

-                           scm_int2num ((bt == 7) ? 4 : 3));
+                      scm_from_int ((bt == 7) ? 4 : 3));

     }
   if (d && bt >= -1 && bt <= 1) // UGH again.
     {
       d->set_property ("staff-position",
     }
   if (d && bt >= -1 && bt <= 1) // UGH again.
     {
       d->set_property ("staff-position",

-                           scm_int2num ((bt == 0) ? -1 : 1));
+                      scm_from_int ((bt == 0) ? -1 : 1));

     }
   return SCM_UNSPECIFIED;
 }
 
 /*
   make this function easily usable in C++
     }
   return SCM_UNSPECIFIED;
 }
 
 /*
   make this function easily usable in C++

- */
+*/

 String
 String

-Rest::glyph_name (Grob *me, int balltype, String style)
+Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)

 {
   bool ledgered_b = false;
 {
   bool ledgered_b = false;

-
-  if (balltype == 0 || balltype == 1)
+  if (try_ledgers && (balltype == 0 || balltype == 1))

     {
       Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0;
       Real pos = Staff_symbol_referencer::get_position (me);
     {
       Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0;
       Real pos = Staff_symbol_referencer::get_position (me);


@@ -67,71 +63,74 @@ Rest::glyph_name (Grob *me, int balltype, String style)
        Figure out when the rest is far enough outside the staff. This
        could bemore generic, but hey, we understand this even after
        dinner.
        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 ());
 
       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)
+  if ((style == "mensural") || (style == "neomensural"))
+    {
+
+      /*
+       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/neomensural 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 = "";
       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;
-}
+    }

 
 

+  return ("rests." + to_string (balltype) + (ledgered_b ? "o" : "")
+         + actual_style);
+}

 
 

-MAKE_SCHEME_CALLBACK (Rest,print,1);
+MAKE_SCHEME_CALLBACK (Rest, print, 1);

 
 SCM
 
 SCM

-Rest::brew_internal_stencil (SCM smob)
+Rest::brew_internal_stencil (SCM smob, bool ledgered)

 {
 {

-  Grob* me = unsmob_grob (smob);
+  Grob *me = unsmob_grob (smob);

 
   SCM balltype_scm = me->get_property ("duration-log");
 
   SCM balltype_scm = me->get_property ("duration-log");

-  if (!ly_c_number_p (balltype_scm))
+  if (!scm_is_number (balltype_scm))

     return Stencil ().smobbed_copy ();
 
     return Stencil ().smobbed_copy ();
 

-  int balltype = ly_scm2int (balltype_scm);
-  
-  String style; 
+  int balltype = scm_to_int (balltype_scm);
+
+  String style;

   SCM style_scm = me->get_property ("style");
   SCM style_scm = me->get_property ("style");

-  if (ly_c_symbol_p (style_scm))
+  if (scm_is_symbol (style_scm))

     style = ly_scm2string (scm_symbol_to_string (style_scm));
 
   Font_metric *fm = Font_interface::get_default_font (me);
     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);
+  String font_char = glyph_name (me, balltype, style, ledgered);

   Stencil out = fm->find_by_name (font_char);
   if (out.is_empty ())
     me->warning (_f ("rest `%s' not found", font_char.to_str0 ()));
   Stencil out = fm->find_by_name (font_char);
   if (out.is_empty ())
     me->warning (_f ("rest `%s' not found", font_char.to_str0 ()));


@@ -139,39 +138,50 @@ Rest::brew_internal_stencil (SCM smob)
   return out.smobbed_copy ();
 }
 
   return out.smobbed_copy ();
 }
 

-SCM 
-Rest::print (SCM smob) 
+SCM
+Rest::print (SCM smob)

 {
 {

-  return brew_internal_stencil (smob);
+  return brew_internal_stencil (smob, true);

 }
 }

-MAKE_SCHEME_CALLBACK (Rest,extent_callback,2);
+
+MAKE_SCHEME_CALLBACK (Rest, extent_callback, 2);

 /*
   We need the callback. The real stencil has ledgers depending on
   Y-position. The Y-position is known only after line breaking.  */
 SCM
 Rest::extent_callback (SCM smob, SCM ax)
 {
 /*
   We need the callback. The real stencil 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) ly_scm2int (ax);
-  SCM m = brew_internal_stencil (smob);
+  Axis a = (Axis) scm_to_int (ax);
+
+  /*
+    Don't want ledgers: ledgers depend on Y position, which depends on
+    rest collision, which depends on stem size which depends on beam
+    slop of opposite note column.
+
+    consequence: we get too small extents and potential collisions
+    with ledgered rests.
+  */
+  SCM m = brew_internal_stencil (smob, a != X_AXIS);

   return ly_interval2scm (unsmob_stencil (m)->extent (a));
 }
 
   return ly_interval2scm (unsmob_stencil (m)->extent (a));
 }
 

-MAKE_SCHEME_CALLBACK (Rest,polyphonic_offset_callback,2);
+MAKE_SCHEME_CALLBACK (Rest, polyphonic_offset_callback, 2);

 SCM
 Rest::polyphonic_offset_callback (SCM smob, SCM)
 {
 SCM
 Rest::polyphonic_offset_callback (SCM smob, SCM)
 {

-  Grob* me = unsmob_grob (smob);
-  if (ly_c_number_p (me->get_property ("staff-position")))
-    return scm_make_real (0);
+  Grob *me = unsmob_grob (smob);
+  if (scm_is_number (me->get_property ("staff-position")))
+    return scm_from_double (0);

 
   Direction d = get_grob_direction (me);
 
   Direction d = get_grob_direction (me);

-  Real off = 2* d ;
+  Real off = 2 * d;

   if (off)
     off *= Staff_symbol_referencer::staff_space (me);
   if (off)
     off *= Staff_symbol_referencer::staff_space (me);

-  return scm_make_real (off);
+
+  return scm_from_double (off);

 }
 
 }
 

-ADD_INTERFACE (Rest,"rest-interface",
-  "A rest symbol.",
-  "style minimum-distance");
+ADD_INTERFACE (Rest, "rest-interface",
+              "A rest symbol.",
+              "style direction minimum-distance");